OSDN Git Service
Makoto Onuki [Tue, 23 Aug 2016 23:44:03 +0000 (23:44 +0000)]
Merge "Backporting shortcut manager test utils to mr1" into nyc-mr1-dev
TreeHugger Robot [Tue, 23 Aug 2016 23:26:47 +0000 (23:26 +0000)]
Merge "Only sync adapters with access can see an account - framework" into nyc-mr1-dev
TreeHugger Robot [Tue, 23 Aug 2016 22:52:31 +0000 (22:52 +0000)]
Merge "Added error handling to settings suggestions list" into nyc-mr1-dev
TreeHugger Robot [Tue, 23 Aug 2016 22:20:38 +0000 (22:20 +0000)]
Merge "Update light mode when battery saver changes" into nyc-mr1-dev
Svetoslav Ganov [Tue, 12 Jul 2016 02:32:30 +0000 (19:32 -0700)]
Only sync adapters with access can see an account - framework
It was possible for a sync adapter without accounts access to
see the account which it is supposed to sync which can be used to
identify the user. This change ensures that only sync adapters
with account access can run (which results in seeing the account),
otherwise we involve the user to approve access only to this account.
A sync adapter can access an account if one of these is true:
- it is signed as the authenticator for this account
- has the GET_ACCOUNTS permission
- has an auth token for the account
- it is a preinstalled app (system or privileged)
The main thing we need to figure out is if the extra prompts
for giving access to a sync adapter to the account create too
much friction.
bug:
28163381
Change-Id: Ie083bb681b5a2aed81ca5f6a062193a175fad77e
Amith Yamasani [Tue, 23 Aug 2016 21:19:03 +0000 (21:19 +0000)]
Merge "Don't complain about sender of MASTER_CLEAR" into nyc-mr1-dev
Makoto Onuki [Tue, 23 Aug 2016 20:52:41 +0000 (20:52 +0000)]
Merge "Do not scan system apps unless after OTA" into nyc-mr1-dev
Jorim Jaggi [Tue, 23 Aug 2016 20:28:04 +0000 (13:28 -0700)]
Update light mode when battery saver changes
Change-Id: I56b309222782d823d80a66c87d30eefed2ce5dc7
Fixes:
30150232
Adam Seaton [Tue, 23 Aug 2016 20:16:34 +0000 (20:16 +0000)]
Merge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Add connection events for indicated when a connection is remotely held." into nyc-dr1-dev
am:
09c77dd2b1 -s ours
Change-Id: I97b120256a68cc2038b72fc13d14ca01729f3199
Tyler Gunn [Tue, 23 Aug 2016 20:16:29 +0000 (20:16 +0000)]
DO NOT MERGE ANYWHERE (nyc-dr1-dev) Add connection events for indicated when a connection is remotely held.
am:
d697c5dc9b -s ours
Change-Id: Id959d48b4c4fa5af883c42cc6fbe052cca10f367
Adrian Roos [Tue, 23 Aug 2016 20:16:23 +0000 (20:16 +0000)]
Merge "Ambient: Pulse for every noisy notification exactly once" into nyc-dr1-dev
am:
e1f32de996
Change-Id: If4171cbb2247cb8bc8f0e4e92f94724bf9ba238e
Adrian Roos [Tue, 23 Aug 2016 20:16:17 +0000 (20:16 +0000)]
Ambient: Pulse for every noisy notification exactly once
am:
97de2b2666
Change-Id: I4ae78e6f4ec4d3652f7f6eefc0cd72d3e881ea89
Adam Seaton [Tue, 23 Aug 2016 20:07:26 +0000 (20:07 +0000)]
Merge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Add connection events for indicated when a connection is remotely held." into nyc-dr1-dev
TreeHugger Robot [Tue, 23 Aug 2016 20:07:10 +0000 (20:07 +0000)]
Merge "Ambient: Pulse for every noisy notification exactly once" into nyc-dr1-dev
Sudheer Shanka [Tue, 23 Aug 2016 19:39:58 +0000 (19:39 +0000)]
Merge "Add installer app check in PM.deletePackage." into nyc-mr1-dev
Robert Carr [Tue, 23 Aug 2016 19:31:27 +0000 (19:31 +0000)]
Only allow focused window to select seamless rotation.
am:
066d94f6df
Change-Id: I22360bd2d0182276c68ed3e300073edf390ffcfa
Amith Yamasani [Tue, 23 Aug 2016 19:26:25 +0000 (12:26 -0700)]
Don't complain about sender of MASTER_CLEAR
Make an exception for MASTER_CLEAR broadcast when checking for
non-protected broadcasts being sent by system uid; Settings app in
this case.
Change-Id: I296404faf2be03601f8f937b96d3e2f70c0e816d
Fixes:
30891377
Tyler Gunn [Wed, 17 Aug 2016 20:48:27 +0000 (13:48 -0700)]
DO NOT MERGE ANYWHERE (nyc-dr1-dev) Add connection events for indicated when a connection is remotely held.
Note: This is different than the existing EVENT_ON_HOLD_TONE_START
and EVENT_ON_HOLD_TONE_END events, which trigger playing a hold tone for
remotely held calls. Those events also take into account whether the call
is foreground/background; it is left as a future exercise to clean that
up.
Bug:
30349182
Change-Id: I919365d243ae3b9fe56454c7a2b9d5805b2c03a2
(cherry picked from commit
b5ed860de71fe165af63b4255da25d0295abaa69)
TreeHugger Robot [Tue, 23 Aug 2016 18:55:45 +0000 (18:55 +0000)]
Merge "Made background updater more robust to state changes" into nyc-mr1-dev
TreeHugger Robot [Tue, 23 Aug 2016 18:53:20 +0000 (18:53 +0000)]
Merge "Avoid weird expand animation when a notification is updated" into nyc-mr1-dev
Todd Kennedy [Tue, 23 Aug 2016 17:39:01 +0000 (17:39 +0000)]
No need to check package name
am:
ef8d8ea24a
Change-Id: Idd8b189070e3e5920cd1b9d12a8ba282de44d11a
Robert Carr [Mon, 22 Aug 2016 20:32:34 +0000 (13:32 -0700)]
Only allow focused window to select seamless rotation.
We require apps to opt in to seamless rotation. If a dialog or some such
has popped up above them, the dialog may not be prepared to rotate
seamlessly and we should just fall back to the old behavior for now.
Bug:
30968345
Change-Id: Ib9a7352ed84d41076bdd162bf38d151b053a307e
(cherry picked from commit
828ec3dc518bfeff9cb9205e40652419e9c59443)
Julius D'souza [Tue, 23 Aug 2016 17:11:39 +0000 (17:11 +0000)]
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support am:
3275a3a5a5 -s ours am:
d5bf4039a9 -s ours am:
b2507eb7b7 -s ours
am:
027f685296 -s ours
Change-Id: Ibc3e2a639ecc8a9b49d899ae6298761dabbd2032
Sailesh Nepal [Tue, 23 Aug 2016 17:11:35 +0000 (17:11 +0000)]
Merge "Add carrier regex config values for VisualVoicemailSmsFilter" into nyc-dr1-dev
am:
74de00a62c
Change-Id: Ibf1283af6133ccd43f75f361fe9a821e87668773
Ta-wei Yen [Tue, 23 Aug 2016 17:11:27 +0000 (17:11 +0000)]
Add carrier regex config values for VisualVoicemailSmsFilter
am:
9a107a2df0
Change-Id: Ie71269986f671ee8d773665107e5504f905da769
Todd Kennedy [Mon, 22 Aug 2016 22:44:00 +0000 (15:44 -0700)]
No need to check package name
Change-Id: I8c403ca2bc38f2c7191b6e9a709286ac7e450ac4
Fixes:
30958291
(cherry picked from commit
afb5269ad6a507a3230b519b3156ac0bcc5fc3a0)
Julius D'souza [Tue, 23 Aug 2016 17:08:33 +0000 (17:08 +0000)]
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support am:
3275a3a5a5 -s ours am:
d5bf4039a9 -s ours
am:
b2507eb7b7 -s ours
Change-Id: I73d049d6855b9cd9420a194bda7079adc2283bb0
Sailesh Nepal [Tue, 23 Aug 2016 17:00:30 +0000 (17:00 +0000)]
Merge "Add carrier regex config values for VisualVoicemailSmsFilter" into nyc-dr1-dev
Julius D'souza [Tue, 23 Aug 2016 16:52:24 +0000 (16:52 +0000)]
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support am:
3275a3a5a5 -s ours
am:
d5bf4039a9 -s ours
Change-Id: I4f1a0acabe5d5385af086791b906ff6f45424e59
Julius D'souza [Tue, 23 Aug 2016 16:45:41 +0000 (16:45 +0000)]
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support
am:
3275a3a5a5 -s ours
Change-Id: Iaae7763a4d744ad8a63538750c5ed3efe38161d5
TreeHugger Robot [Tue, 23 Aug 2016 16:39:44 +0000 (16:39 +0000)]
Merge "AppErrors: Don't suppress dialogs when ANR_SHOW_BACKGROUND is set" into nyc-mr1-dev
TreeHugger Robot [Tue, 23 Aug 2016 16:38:17 +0000 (16:38 +0000)]
Merge "Ambient: Pulse for every noisy notification exactly once" into nyc-mr1-dev
Scott Main [Tue, 23 Aug 2016 15:56:15 +0000 (15:56 +0000)]
Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev am:
77917a835f
am:
f8a0cb2964
Change-Id: Ifff17568fd5ac67443fa7cfbbb0526f0b16b3c34
smain@google.com [Tue, 23 Aug 2016 15:56:14 +0000 (15:56 +0000)]
add workaround for annotations dependency conflict with espresso am:
eee3518d11
am:
349edcf169
Change-Id: I178c7bc7c2639559e8b4848f1a2af0bcdffcc849
Adrian Roos [Mon, 22 Aug 2016 13:31:38 +0000 (15:31 +0200)]
Ambient: Pulse for every noisy notification exactly once
Also increases the pulse duration and switches timing to
elapsed realtime instead of wall time for robustness. Also
remove triggering for notification light for simplifying code.
Only noisy notifications are able to trigger the light anyway and
noisy notifications already trigger ambient on their own.
Change-Id: I4efbe530bb1a60cabaa46c2b04bcd5e12cdef680
Fixes:
31004875
Scott Main [Tue, 23 Aug 2016 15:47:18 +0000 (15:47 +0000)]
Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev
am:
77917a835f
Change-Id: Ibc54a5b58aad47a49bf5cb5a69ae3ddf461ccd15
smain@google.com [Tue, 23 Aug 2016 15:47:15 +0000 (15:47 +0000)]
add workaround for annotations dependency conflict with espresso
am:
eee3518d11
Change-Id: I05f1b9063433e060427f627c46aab64972fe45cf
Ta-wei Yen [Fri, 19 Aug 2016 18:43:15 +0000 (11:43 -0700)]
Add carrier regex config values for VisualVoicemailSmsFilter
Verizon requires all SMS that starts with "//VZWVVM" to be treated
as a VVM SMS.
EXTRA_VOICEMAIL_SMS_MESSAGE_BODY is also added to VociemailContract
to send the message body of a SMS that matches the carrier regex but
is not parsable.
Bug:
30954955
Change-Id: Ib5449164a5290b132648cc28b1e1d3d9ddd5fea0
(cherry picked from commit
ad31603b80e13e914ff4c3a41b5c04558d04d3ca)
Scott Main [Tue, 23 Aug 2016 15:42:01 +0000 (15:42 +0000)]
Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev
TreeHugger Robot [Tue, 23 Aug 2016 14:07:11 +0000 (14:07 +0000)]
Merge "Documentation warning against short-lived Contexts" into nyc-mr1-dev
Rubin Xu [Tue, 23 Aug 2016 13:00:33 +0000 (13:00 +0000)]
Merge "Handle null packageName in PendingIntentRecord" into nyc-mr1-dev
Rubin Xu [Tue, 23 Aug 2016 12:59:16 +0000 (12:59 +0000)]
Merge "Not longer need MANAGE_DEVICE_ADMINS permission." into nyc-mr1-dev
TreeHugger Robot [Tue, 23 Aug 2016 12:49:56 +0000 (12:49 +0000)]
Merge "Force application context for KeyChain bindings" into nyc-mr1-dev
Robin Lee [Fri, 12 Aug 2016 11:46:28 +0000 (12:46 +0100)]
Documentation warning against short-lived Contexts
It's better to use an Application Context rather than hoping the
activity won't be destroyed in another thread (because it will).
Change-Id: I9bf842d0d7dbedcc509a4a314d23a9a6cfca4d48
Fix:
29873669
Adrian Roos [Tue, 23 Aug 2016 12:26:39 +0000 (14:26 +0200)]
AppErrors: Don't suppress dialogs when ANR_SHOW_BACKGROUND is set
Change-Id: Ie6013013ff4e23e51e471e97d15e113cc759657e
Fixes:
30929056
Adrian Roos [Mon, 22 Aug 2016 13:31:38 +0000 (15:31 +0200)]
Ambient: Pulse for every noisy notification exactly once
Also increases the pulse duration and switches timing to
elapsed realtime instead of wall time for robustness. Also
remove triggering for notification light for simplifying code.
Only noisy notifications are able to trigger the light anyway and
noisy notifications already trigger ambient on their own.
Change-Id: I4efbe530bb1a60cabaa46c2b04bcd5e12cdef680
Fixes:
31004875
Adrian Roos [Tue, 23 Aug 2016 10:30:19 +0000 (10:30 +0000)]
Merge "HIC: Improve AccelerationClassifier" into nyc-dr1-dev
am:
06165f534f
Change-Id: I9bf58eefc326cd4ce67f38b8467d49e17be409d2
Adrian Roos [Tue, 23 Aug 2016 10:30:18 +0000 (10:30 +0000)]
HIC: Improve AccelerationClassifier
am:
4dc14b231e
Change-Id: I8bec656ec5cea3ec94b0bb0baada236162106df5
Adrian Roos [Tue, 23 Aug 2016 10:22:22 +0000 (10:22 +0000)]
Merge "HIC: Improve AccelerationClassifier" into nyc-dr1-dev
Lorenzo Colitti [Tue, 23 Aug 2016 09:37:52 +0000 (09:37 +0000)]
Refactor NetworkNotificationManager.
am:
0b59906768
Change-Id: I0084400264ccfc352f50e58acda9b8e056dbf766
Lorenzo Colitti [Tue, 23 Aug 2016 09:37:12 +0000 (09:37 +0000)]
Move notification code out of ConnectivityService.
am:
f3ae2eeae4
Change-Id: I06cf2f70bc466c7cf03db246ec49f728b6881300
Lorenzo Colitti [Mon, 22 Aug 2016 13:36:19 +0000 (22:36 +0900)]
Refactor NetworkNotificationManager.
1. Move from deprecated network types to transport types.
2. Rename and simplify (by passing in a NetworkAgentInfo object)
the call signature of the method that displays notifications.
3. Add a method to clear notification, and unindent lots of code.
4. Move the legacy DcTracker-issued notification code to
NetworkNotificationManager.
Bug:
31025214
Change-Id: Ie49c60126d0ed5bac620bc47e84fe038791b2d6c
Lorenzo Colitti [Mon, 22 Aug 2016 07:30:00 +0000 (16:30 +0900)]
Move notification code out of ConnectivityService.
Bug:
31025214
Change-Id: I4190be6b57f92298b79bea8868f1876ecbfd2d75
TreeHugger Robot [Tue, 23 Aug 2016 05:35:38 +0000 (05:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Tue, 23 Aug 2016 03:47:43 +0000 (20:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5785b293e1062ba5b04d60237569c77be7517603
Auto-generated-cl: translation import
TreeHugger Robot [Tue, 23 Aug 2016 02:31:25 +0000 (02:31 +0000)]
Merge "Set Root.FLAG_LOCAL_ONLY for MTP roots." into nyc-mr1-dev
Yang Ni [Tue, 23 Aug 2016 01:51:42 +0000 (01:51 +0000)]
Updated user document for Single-Source RenderScript am:
c069ed7f8c
am:
044cd35a46
Change-Id: If5db868bb98fe69d72fe09b662b33bff22d6b22e
Yang Ni [Tue, 23 Aug 2016 01:43:23 +0000 (01:43 +0000)]
Updated user document for Single-Source RenderScript
am:
c069ed7f8c
Change-Id: I432fe39e8fa7fd2c33920021341a245e2ec9c72d
TreeHugger Robot [Tue, 23 Aug 2016 00:45:13 +0000 (00:45 +0000)]
Merge "No need to check package name" into nyc-mr1-dev
Makoto Onuki [Mon, 22 Aug 2016 18:28:20 +0000 (11:28 -0700)]
Backporting shortcut manager test utils to mr1
Bug
29612099
Change-Id: I33641b2c95f8fe859fa3256b491c039ab273fff5
Makoto Onuki [Mon, 22 Aug 2016 23:19:04 +0000 (16:19 -0700)]
Do not scan system apps unless after OTA
Bug
30956231
Change-Id: I4af34cdd39cfaf0b8712b9ded1ef119efa3e04b0
Fyodor Kupolov [Tue, 23 Aug 2016 00:25:40 +0000 (00:25 +0000)]
Merge "Added getDataPreloadsMediaDirectory" into nyc-dr1-dev
am:
0a376f5619
Change-Id: I114f0b42e75d2aa9a288334999b7d44f0830a2d3
Fyodor Kupolov [Tue, 23 Aug 2016 00:25:28 +0000 (00:25 +0000)]
Added getDataPreloadsMediaDirectory
am:
19551a8d8d
Change-Id: Ic8ee2d35b2bca11807a7a54aee371df092b3b19c
Android Build Merger (Role) [Tue, 23 Aug 2016 00:21:17 +0000 (00:21 +0000)]
Merge changes from topic 'am-
c5d69672042b41758555eb3db8f077fe' into nyc-mr1-dev
* changes:
Merge "Change retail mode wallpaper (1/2)" into nyc-dr1-dev am:
c7136b3b3c
Change retail mode wallpaper (1/2) am:
6c902d0453
Android Build Merger (Role) [Tue, 23 Aug 2016 00:20:51 +0000 (00:20 +0000)]
Merge "Merge "Only dispatch window visibility aggregation for targetSdk >= N" into nyc-dr1-dev am:
081e393103" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 23 Aug 2016 00:20:34 +0000 (00:20 +0000)]
Merge "Only dispatch window visibility aggregation for targetSdk >= N am:
64e1ba4398" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 23 Aug 2016 00:20:16 +0000 (00:20 +0000)]
Merge "Doc change: intl page updates for final n release. am:
e816f1f542 am:
79d9e9df2e" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 23 Aug 2016 00:19:59 +0000 (00:19 +0000)]
Merge "Merge "Fix wallpaper backup eligibility test" into nyc-dr1-dev am:
56ce19099d" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 23 Aug 2016 00:19:41 +0000 (00:19 +0000)]
Merge "Fix wallpaper backup eligibility test am:
f7d1b5de6e" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 23 Aug 2016 00:19:22 +0000 (00:19 +0000)]
Merge "Merge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Prevent FIFO threads from creating more FIFO threads." into nyc-dr1-dev am:
051d6b74eb -s ours" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 23 Aug 2016 00:19:03 +0000 (00:19 +0000)]
Merge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Prevent FIFO threads from creating more FIFO threads. am:
d72b26085c -s ours" into nyc-mr1-dev
Sanket Padawe [Tue, 23 Aug 2016 00:18:01 +0000 (00:18 +0000)]
Merge "If Vodafone Italy sim is in Spain consider it as roaming on Spain nw." into nyc-mr1-dev
Jorim Jaggi [Tue, 23 Aug 2016 00:17:25 +0000 (00:17 +0000)]
Merge "Change retail mode wallpaper (1/2)" into nyc-dr1-dev
am:
c7136b3b3c
Change-Id: Ie24a9df629ef47d1d75ddb1c3bdf72b01f69db37
Jorim Jaggi [Tue, 23 Aug 2016 00:17:20 +0000 (00:17 +0000)]
Change retail mode wallpaper (1/2)
am:
6c902d0453
Change-Id: I1ca69b6cc7450d7f7056e69e3cf7fab1ad2df624
Adam Powell [Tue, 23 Aug 2016 00:17:16 +0000 (00:17 +0000)]
Merge "Only dispatch window visibility aggregation for targetSdk >= N" into nyc-dr1-dev
am:
081e393103
Change-Id: I013ae707efd89eb7d29fd077dc5593a474657e74
Adam Powell [Tue, 23 Aug 2016 00:17:14 +0000 (00:17 +0000)]
Only dispatch window visibility aggregation for targetSdk >= N
am:
64e1ba4398
Change-Id: Id2d00bc0ae66cdfca11e34b8f1465e4ce19243dc
Dirk Dougherty [Tue, 23 Aug 2016 00:17:11 +0000 (00:17 +0000)]
Doc change: intl page updates for final n release. am:
e816f1f542
am:
79d9e9df2e
Change-Id: I26bb9745b481611e209d398c95f8c54727d0c8fe
Chris Tate [Tue, 23 Aug 2016 00:17:09 +0000 (00:17 +0000)]
Merge "Fix wallpaper backup eligibility test" into nyc-dr1-dev
am:
56ce19099d
Change-Id: Ie050c1b69d4692c828ad41e6c0f32fb6e89084f6
Christopher Tate [Tue, 23 Aug 2016 00:17:06 +0000 (00:17 +0000)]
Fix wallpaper backup eligibility test
am:
f7d1b5de6e
Change-Id: Ib0023f452284b2123df402c09731323b98886e81
Adam Seaton [Tue, 23 Aug 2016 00:17:03 +0000 (00:17 +0000)]
Merge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Prevent FIFO threads from creating more FIFO threads." into nyc-dr1-dev
am:
051d6b74eb -s ours
Change-Id: I790f9bb052f72c89e84fc1b41942a1707cdc43e4
Tim Murray [Tue, 23 Aug 2016 00:17:02 +0000 (00:17 +0000)]
DO NOT MERGE ANYWHERE (nyc-dr1-dev) Prevent FIFO threads from creating more FIFO threads.
am:
d72b26085c -s ours
Change-Id: I8676c789e957407268a38c1d0958479f3026fe24
Fyodor Kupolov [Tue, 23 Aug 2016 00:16:54 +0000 (00:16 +0000)]
Merge "Added getDataPreloadsMediaDirectory" into nyc-dr1-dev
Adam Seaton [Tue, 23 Aug 2016 00:13:08 +0000 (00:13 +0000)]
Merge "DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information" into nyc-dr1-dev
am:
ad1008d089 -s ours
Change-Id: I061b3254230cb99b93995bc498d59efbfdb4e4e3
Andy Hung [Tue, 23 Aug 2016 00:13:06 +0000 (00:13 +0000)]
DO NOT MERGE ANYWHERE:AudioSystem: Verify audio port array information
am:
05a1df9967 -s ours
Change-Id: I913db67adcb23be439505d5eba438f1249fd8b8c
Adam Seaton [Tue, 23 Aug 2016 00:13:04 +0000 (00:13 +0000)]
Merge "DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity." into nyc-dr1-dev
am:
0f1e7ab1d3 -s ours
Change-Id: Ic46aeb12f03e20c3379740934b4c80b228499124
George Mount [Tue, 23 Aug 2016 00:13:02 +0000 (00:13 +0000)]
DO NOT MERGE ANYWHERE:Fix NPE during Activity transition using wrong Activity.
am:
c9373e5505 -s ours
Change-Id: I9cd703751daedc696285d7023dc8f1aac1deaa3e
Todd Kennedy [Tue, 23 Aug 2016 00:12:59 +0000 (00:12 +0000)]
DO NOT MERGE ANYWHERE: Release mPackages lock earlier
am:
bab7c28e5e -s ours
Change-Id: I8e3db3e883768c3af283a549aa7f464a7408a36e
Dirk Dougherty [Tue, 23 Aug 2016 00:12:57 +0000 (00:12 +0000)]
Doc change: updates for final N landing page and related resources. am:
b0ca00431f
am:
b78a9bc5fe
Change-Id: I50dd9fff2cfc7653f90b5f2b2d00cfc2f95d8fb2
David Friedman [Tue, 23 Aug 2016 00:12:54 +0000 (00:12 +0000)]
Merge "Docs: Adding information to Building-for-Billions landing page." into nyc-dev am:
410ae5b004
am:
e5036b3cab
Change-Id: I0e0b5b2f9f0196f1caed4d2e76aa7e70cd346805
David Friedman [Tue, 23 Aug 2016 00:06:34 +0000 (00:06 +0000)]
Docs: Adding information to Building-for-Billions landing page. am:
cbaf3f9986
am:
2663c419c0
Change-Id: Ia66d68ac34f987e9724731ea96ef21c98db8eca3
David Friedman [Tue, 23 Aug 2016 00:06:27 +0000 (00:06 +0000)]
Merge "Docs: Adds a redirect to make it easier to access Performance section on DAC." into nyc-dev am:
162a0005ac
am:
c02c6b8fb0
Change-Id: Icabe2b1760a14ef31d1ce092bec0ec2b42d16bcd
David Friedman [Tue, 23 Aug 2016 00:06:20 +0000 (00:06 +0000)]
Docs: Adds a redirect to make it easier to access Performance section on DAC. am:
196cb73dbb
am:
f5c5eb0045
Change-Id: I3893d4f1e0a3122afc4ed180727d66345b3f4090
Jim Miller [Tue, 23 Aug 2016 00:06:12 +0000 (00:06 +0000)]
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev am:
02e9affa42 am:
ddf70b9195 am:
364a51221a -s ours am:
ce0856f702
am:
41d1827fd3
Change-Id: I305d7afc49624716b67dd1d54ea13b3f76cd2216
Jim Miller [Tue, 23 Aug 2016 00:06:05 +0000 (00:06 +0000)]
Bind fingerprint when we start authentication - DO NOT MERGE am:
b6f4b48df2 am:
9f04985991 am:
85c390e9fb -s ours am:
f159feff98
am:
ade6f4df5b
Change-Id: Ib1eae543579908fe40c51186f7ab54fdde52b4a9
Sudheer Shanka [Mon, 22 Aug 2016 23:57:09 +0000 (23:57 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am:
b51e98becb am:
7e890c8eb5 am:
08eb52f9f9 am:
58def3804c -s ours am:
e49de5e073
am:
105453e170
Change-Id: Ic86e58a455b3d8d7bb2c2ed7eee66910e28115ca
Amith Yamasani [Mon, 22 Aug 2016 23:57:07 +0000 (23:57 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
d1eeb5b7b4 am:
29ae7b1a27 am:
39c7879365 am:
5841c492a7 -s ours am:
f705730667
am:
d09a6aa0f0
Change-Id: I00d2208a02f04cc5ca58a66977ddcf8b4da1983a
Sudheer Shanka [Mon, 22 Aug 2016 23:57:05 +0000 (23:57 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into nyc-dev am:
badc5cd942
am:
f1e0a4a60c
Change-Id: I9372581fd75519c51d034f9bc59b62f7b67433af
Amith Yamasani [Mon, 22 Aug 2016 23:57:03 +0000 (23:57 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
55eacb9441
am:
ac9bb3886d
Change-Id: I35e8e83f565bea86f409da9dd7ca7314747d6ed9
Svetoslav Ganov [Mon, 22 Aug 2016 23:57:00 +0000 (23:57 +0000)]
Add resource based mechanism to grant default permissions
am:
d44d46aa50
Change-Id: If97c1e008dccf35e0c3e8623b2a461db6e46023c
Rob Carr [Mon, 22 Aug 2016 23:53:01 +0000 (23:53 +0000)]
Merge "Only allow focused window to select seamless rotation." into nyc-mr1-dev
OSDN Git Service
