OSDN Git Service
Bennie Ouyang [Tue, 21 Jun 2016 20:47:29 +0000 (20:47 +0000)]
Merge \"Fixed notificaiton Stress Test\" into nyc-dev
am:
2f59ee10b2
Change-Id: I4629e78b47f23624638955d1f7bdabfb8cb86b4b
Bennie Ouyang [Tue, 21 Jun 2016 20:42:01 +0000 (20:42 +0000)]
Merge "Fixed notificaiton Stress Test" into nyc-dev
Wale Ogunwale [Tue, 21 Jun 2016 20:05:14 +0000 (20:05 +0000)]
Merge \"Always report window move to client\" into nyc-dev
am:
aab580af55
Change-Id: I9d1ab64cb162bae72bd71a422d80be74d3a4aae8
Chad Brubaker [Tue, 21 Jun 2016 19:59:58 +0000 (19:59 +0000)]
Merge \"Add getApplicationConfigForPackage\" into nyc-dev
am:
abe85d3886
Change-Id: If1fdfea45a62c4e0823c0f307e84d40f46f12fec
Felipe Leme [Tue, 21 Jun 2016 19:59:53 +0000 (19:59 +0000)]
Merge \"Ignore system apps on enforceMeteredApnPolicy().\" into nyc-dev
am:
fa2715e03b
Change-Id: I98440b2ae3371661ed8b1b2f29b0ba18e1b6e6c3
TreeHugger Robot [Tue, 21 Jun 2016 19:55:54 +0000 (19:55 +0000)]
Merge "Always report window move to client" into nyc-dev
TreeHugger Robot [Tue, 21 Jun 2016 19:51:19 +0000 (19:51 +0000)]
Merge "Add getApplicationConfigForPackage" into nyc-dev
TreeHugger Robot [Tue, 21 Jun 2016 19:50:59 +0000 (19:50 +0000)]
Merge "Ignore system apps on enforceMeteredApnPolicy()." into nyc-dev
Dianne Hackborn [Tue, 21 Jun 2016 19:27:33 +0000 (19:27 +0000)]
Merge \"Reduce race when connecting to an existing content provider.\" into nyc-dev
am:
5f9afa968d
Change-Id: I246d1fcabaa040171e76ef57ce1a04b088c93a51
Dianne Hackborn [Tue, 21 Jun 2016 19:18:36 +0000 (19:18 +0000)]
Merge "Reduce race when connecting to an existing content provider." into nyc-dev
Selim Cinek [Tue, 21 Jun 2016 18:14:29 +0000 (18:14 +0000)]
Merge \"Fixed an issue where the deleteintent of children wasn\'t sent\" into nyc-dev
am:
1e7d8d3817
Change-Id: I68a4c2c3d3a56712ab8989649ca6cbbeb2712936
Adrian Roos [Tue, 21 Jun 2016 18:10:56 +0000 (18:10 +0000)]
Merge \"Allow trust agents to run during provisioning\" into nyc-dev
am:
1dd403b61a
Change-Id: Iff3055ccad07766b2529375a53b3fca60e41efcc
Selim Cinek [Tue, 21 Jun 2016 18:07:41 +0000 (18:07 +0000)]
Merge "Fixed an issue where the deleteintent of children wasn't sent" into nyc-dev
TreeHugger Robot [Tue, 21 Jun 2016 18:04:05 +0000 (18:04 +0000)]
Merge "Allow trust agents to run during provisioning" into nyc-dev
Bill Yi [Tue, 21 Jun 2016 17:13:55 +0000 (17:13 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
284a71ecd6 -s ours
Change-Id: I3bc7c180ab44d5884292f87e57337c22f2e8110b
Bill Yi [Tue, 21 Jun 2016 17:13:52 +0000 (17:13 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
d837e61078 -s ours
Change-Id: Id84adf98244b231a35450cd6d8ae7194d475c202
Dianne Hackborn [Mon, 20 Jun 2016 22:20:15 +0000 (15:20 -0700)]
Reduce race when connecting to an existing content provider.
We lost the code that checks to see if the target process still
exists and aborts trying to use it if so. To reduce the race
there, we have a new explicit check of the state of the process.
Hopefully fixes some of issue #
28737082.
Change-Id: I37a7a6e9767516d564168ef5e110c4adafe3fb76
Bennie Ouyang [Mon, 20 Jun 2016 18:01:54 +0000 (11:01 -0700)]
Fixed notificaiton Stress Test
Bug:
29506953
Change-Id: I8f8e7b2f0b03b48665b524472a8e81aef6a7a708
TreeHugger Robot [Tue, 21 Jun 2016 16:52:05 +0000 (16:52 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 21 Jun 2016 16:51:50 +0000 (16:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Alan Viverette [Tue, 21 Jun 2016 13:54:03 +0000 (13:54 +0000)]
Merge \"Only block invalidation in DrawableContainer initialization\" into nyc-dev
am:
7a372a13af
Change-Id: If818fb8f01f5a20217cb57d232eb1e1afd516be6
Alan Viverette [Tue, 21 Jun 2016 13:47:19 +0000 (13:47 +0000)]
Merge "Only block invalidation in DrawableContainer initialization" into nyc-dev
sreevanis [Tue, 21 Jun 2016 11:59:13 +0000 (11:59 +0000)]
Merge \\\"Documented how to handle advertisements during audio playback.\\\" into mnc-io-docs am:
07340a654a am:
5fef4a7d44
am:
41a7bdec97
Change-Id: I0787c301ab85f1ff866b1d1eb7c4845186da8f2e
Sreevani Sreejith [Tue, 21 Jun 2016 11:55:54 +0000 (11:55 +0000)]
Merge \\"Documented how to handle advertisements during audio playback.\\" into mnc-io-docs am:
07340a654a
am:
5fef4a7d44
Change-Id: Ica1016e018fe5e278babd490b631414ad220f290
sreevanis [Tue, 21 Jun 2016 11:50:22 +0000 (11:50 +0000)]
Merge \"Documented how to handle advertisements during audio playback.\" into mnc-io-docs
am:
07340a654a
Change-Id: I58c4cb8ec6d86a1bb1464a4fedd14ff21ab3a863
Sreevani Sreejith [Tue, 21 Jun 2016 11:44:19 +0000 (11:44 +0000)]
Merge "Documented how to handle advertisements during audio playback." into mnc-io-docs
sreevanis [Tue, 14 Jun 2016 17:39:57 +0000 (10:39 -0700)]
Documented how to handle advertisements during audio playback.
Bug:
24986554
Change-Id: I02cc0500492661ae7cde6cdae30490c00f8e4b97
Bill Yi [Tue, 21 Jun 2016 07:53:23 +0000 (00:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8c3ebf247f9029af5c1322e2a5c115a1d854196f
Auto-generated-cl: translation import
Bill Yi [Tue, 21 Jun 2016 07:24:26 +0000 (00:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8d44c51c82552053591fd0f45741f5cf05c956d6
Auto-generated-cl: translation import
Andrii Kulian [Tue, 21 Jun 2016 05:27:27 +0000 (05:27 +0000)]
Merge \"Compare intent filter when launching adjacent\" into nyc-dev
am:
9980514ee0
Change-Id: Icdd46a5b4735f04d8e82cd5ffb34bfd9066a431f
Andrii Kulian [Tue, 21 Jun 2016 05:17:58 +0000 (05:17 +0000)]
Merge "Compare intent filter when launching adjacent" into nyc-dev
Jeremie GARCIA [Tue, 21 Jun 2016 03:02:46 +0000 (03:02 +0000)]
Merge \"Parse \"vendor/priv-app\" to find privileged applications\" into nyc-dev
am:
8a1bc54ab0
Change-Id: I8bd79a69124345d826eff9e32b00aa8466058370
TreeHugger Robot [Tue, 21 Jun 2016 02:56:36 +0000 (02:56 +0000)]
Merge "Parse "vendor/priv-app" to find privileged applications" into nyc-dev
Felipe Leme [Mon, 20 Jun 2016 23:36:29 +0000 (16:36 -0700)]
Ignore system apps on enforceMeteredApnPolicy().
BUG:
29514913
Fixes:
29448383
Change-Id: I19eb004c937e1c872bbf82caa7a919e43d48a259
Jeremie GARCIA [Thu, 5 Nov 2015 17:27:59 +0000 (18:27 +0100)]
Parse "vendor/priv-app" to find privileged applications
Change-Id: Icbbafba96b7880f51ca3afcee53d5f3dd5b86a45
Signed-off-by: Jeremie GARCIA <jeremie.garcia@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
Bug:
29488499
Wale Ogunwale [Mon, 20 Jun 2016 23:08:12 +0000 (23:08 +0000)]
Merge \"Don\'t re-launch stopped activities while the device is sleeping\" into nyc-dev
am:
f159b74608
Change-Id: Iaf6cdfd3e6b7ec6a1e1d37cc200b196d105f1ef7
TreeHugger Robot [Mon, 20 Jun 2016 23:03:45 +0000 (23:03 +0000)]
Merge "Don't re-launch stopped activities while the device is sleeping" into nyc-dev
Wei Jia [Mon, 20 Jun 2016 23:03:20 +0000 (23:03 +0000)]
Merge \"MediaPlayer: fix java doc for setPlaybackParams.\" into nyc-dev
am:
bd45be5032
Change-Id: I1b3604fe84dacf3febf324de154cad00fcd688b8
Wei Jia [Mon, 20 Jun 2016 22:58:32 +0000 (22:58 +0000)]
Merge "MediaPlayer: fix java doc for setPlaybackParams." into nyc-dev
Wei Jia [Thu, 16 Jun 2016 22:18:20 +0000 (15:18 -0700)]
MediaPlayer: fix java doc for setPlaybackParams.
Bug:
29032949
Change-Id: I75a59e2a4c75b5e84e2257f8e386d7b05faf9c1b
Sudheer Shanka [Mon, 20 Jun 2016 22:43:21 +0000 (22:43 +0000)]
Merge \"Allow call addSharedAccountsFromParentUser with CREATE_USERS permission.\" into nyc-dev
am:
f00e780472
Change-Id: Iff3282ba0b141652697c7100ff5db77906666f2e
smain@google.com [Mon, 20 Jun 2016 22:40:24 +0000 (22:40 +0000)]
Merge \"just a reorg of some links to put all Android Studio help button redirects together\" into nyc-dev
am:
db4ef3f4f8
Change-Id: Ib2bcfa6c5bdfb7475b714c5fef947b3f173f1914
Selim Cinek [Mon, 20 Jun 2016 22:40:07 +0000 (15:40 -0700)]
Fixed an issue where the deleteintent of children wasn't sent
Especially in context of autobundling this could lead to bad bugs
Change-Id: Idf722f9675f6f6e49d49c08798e38e09b1c5c01e
Fixes:
29515621
Sudheer Shanka [Mon, 20 Jun 2016 22:38:48 +0000 (22:38 +0000)]
Merge "Allow call addSharedAccountsFromParentUser with CREATE_USERS permission." into nyc-dev
Antonio Cansado [Mon, 20 Jun 2016 22:29:49 +0000 (22:29 +0000)]
Merge \"Fix infinite loop when registering data usage callback.\" into nyc-dev
am:
c20ffc2a9e
Change-Id: I477910de04ef5a9a35d795240b93c3cf56e78042
Scott Main [Mon, 20 Jun 2016 22:28:54 +0000 (22:28 +0000)]
Merge "just a reorg of some links to put all Android Studio help button redirects together" into nyc-dev
smain@google.com [Mon, 20 Jun 2016 22:25:56 +0000 (15:25 -0700)]
just a reorg of some links to put all Android Studio help button redirects together
Change-Id: If928756a87b18a12caa21effa15c5005d74f15c6
Antonio Cansado [Mon, 20 Jun 2016 22:23:34 +0000 (22:23 +0000)]
Merge "Fix infinite loop when registering data usage callback." into nyc-dev
Dianne Hackborn [Mon, 20 Jun 2016 22:18:29 +0000 (22:18 +0000)]
Merge \"Fix issue #
29438842: Enter the \"am broadcast -a...\" into nyc-dev
am:
d2480ab7bb
Change-Id: Ic0748c75374e236cce9a7d218d38b97397722696
Dianne Hackborn [Mon, 20 Jun 2016 22:09:27 +0000 (22:09 +0000)]
Merge "Fix issue #
29438842: Enter the "am broadcast -a..." into nyc-dev
Hemal Patel [Mon, 20 Jun 2016 22:04:48 +0000 (22:04 +0000)]
Docs: Changed sample link under Related Samples am:
ab5de09e7e am:
d5af0a1214
am:
2a3336813a
Change-Id: I23fb27cd245d80d942c999466ebd8c6229379af8
Antonio Cansado [Mon, 20 Jun 2016 22:03:03 +0000 (15:03 -0700)]
Fix infinite loop when registering data usage callback.
Trivial fix is to call the method that takes the handler as a param.
Bug:
29508547
Change-Id: I75ba30a1663be265eed56b24deda82e83fd47a43
Hemal Patel [Mon, 20 Jun 2016 22:01:02 +0000 (22:01 +0000)]
Docs: Changed sample link under Related Samples am:
ab5de09e7e
am:
d5af0a1214
Change-Id: I70c520f7ee4141b3c7c193aef6e4559ea5b35cc9
Adrian Roos [Mon, 20 Jun 2016 21:58:59 +0000 (14:58 -0700)]
Allow trust agents to run during provisioning
Fixes a bug where trust agents weren't able to run during
provisioning, because user presence is only acknowledged after
provisioning completed.
Change-Id: Ib9ed235e8372555fdc40eefd0fc6b1192613abda
Fixes:
29231515
Hemal Patel [Mon, 20 Jun 2016 21:53:54 +0000 (21:53 +0000)]
Docs: Changed sample link under Related Samples
am:
ab5de09e7e
Change-Id: Ic7423b2c59cb70ff8a13c8b67e51e5d6e572f278
Roozbeh Pournader [Mon, 20 Jun 2016 21:44:50 +0000 (21:44 +0000)]
Merge \"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\" into nyc-dev
am:
160126e2d8
Change-Id: I0897fc904264955dddf459c893bd774fb1ff74e1
Roozbeh Pournader [Mon, 20 Jun 2016 21:39:20 +0000 (21:39 +0000)]
Merge "Mark Serbian in Latin script as non-localized [DO NOT MERGE]" into nyc-dev
Hall Liu [Mon, 20 Jun 2016 21:37:51 +0000 (21:37 +0000)]
Merge \\\\\"DO NOT MERGE Disable app pinning when emergency call button pressed\\\\\" into mnc-dev am:
fc32ec1aef am:
aeba34533c am:
317d0cb169 am:
edace5e820 -s ours
am:
f184789ae9
Change-Id: Id61a15877effef257890c333bf77f628a56e39d3
Hall Liu [Mon, 20 Jun 2016 21:31:36 +0000 (21:31 +0000)]
Merge \\\\"DO NOT MERGE Disable app pinning when emergency call button pressed\\\\" into mnc-dev am:
fc32ec1aef am:
aeba34533c am:
317d0cb169
am:
edace5e820 -s ours
Change-Id: Iab755e613521b81b0c8df57269e4c7752ae6011e
Hall Liu [Mon, 20 Jun 2016 21:28:09 +0000 (21:28 +0000)]
Merge \\\"DO NOT MERGE Disable app pinning when emergency call button pressed\\\" into mnc-dev am:
fc32ec1aef am:
aeba34533c
am:
317d0cb169
Change-Id: I9fb47597393f5b1267ec37a05cd9aa34eebebd23
Wale Ogunwale [Mon, 20 Jun 2016 21:23:20 +0000 (21:23 +0000)]
Merge \"Revert \"Don\'t re-launch activities while the device is sleeping\"\" into nyc-dev
am:
beaf3707fa
Change-Id: I1328274d5d331defc274ba010218274105d760e4
Hall Liu [Mon, 20 Jun 2016 21:21:25 +0000 (21:21 +0000)]
Merge \\"DO NOT MERGE Disable app pinning when emergency call button pressed\\" into mnc-dev am:
fc32ec1aef
am:
aeba34533c
Change-Id: Id2da5c1dcf1477c5ee71e1ecb25ccfbc92aed7bc
Wale Ogunwale [Mon, 20 Jun 2016 21:16:22 +0000 (14:16 -0700)]
Don't re-launch stopped activities while the device is sleeping
Don't ensure configuration for stopped activities while the device
is sleeping as we don't want to relaunch activities in this state.
Note that the right configuration will be applied to the activity
the next time we try to make it visible. The re-launch will happen
then.
Bug:
28518380
Change-Id: Id79d7817ba8f213d89cae6964de09cafe17481f9
Hall Liu [Mon, 20 Jun 2016 21:15:42 +0000 (21:15 +0000)]
Merge \"DO NOT MERGE Disable app pinning when emergency call button pressed\" into mnc-dev
am:
fc32ec1aef
Change-Id: I04ff0004a9112cfbe7e61b2fa6cb3fd4f037bbd0
TreeHugger Robot [Mon, 20 Jun 2016 21:11:04 +0000 (21:11 +0000)]
Merge "Revert "Don't re-launch activities while the device is sleeping"" into nyc-dev
Hall Liu [Mon, 20 Jun 2016 21:04:41 +0000 (21:04 +0000)]
Merge "DO NOT MERGE Disable app pinning when emergency call button pressed" into mnc-dev
Steve McKay [Mon, 20 Jun 2016 20:53:11 +0000 (20:53 +0000)]
Merge \"Make advanced storage option sticky...\" into nyc-dev
am:
361ccf5eef
Change-Id: I2369ba044813d2392a73ab369c012f1eb0ef51e8
TreeHugger Robot [Mon, 20 Jun 2016 20:45:03 +0000 (20:45 +0000)]
Merge "Make advanced storage option sticky..." into nyc-dev
Joe Fernandez [Mon, 20 Jun 2016 20:22:08 +0000 (20:22 +0000)]
Merge \"docs: Narnia 2 advertising language update\" into nyc-dev
am:
ebad16f3c0
Change-Id: Iaaa2d444942d84b8aa07304b19d5104705efc757
Joe Fernandez [Mon, 20 Jun 2016 20:13:08 +0000 (20:13 +0000)]
Merge "docs: Narnia 2 advertising language update" into nyc-dev
Adam Lesinski [Mon, 20 Jun 2016 19:55:37 +0000 (19:55 +0000)]
Merge \"BatteryStats: record best estimated battery capacity\" into nyc-dev
am:
c2e06a55f9
Change-Id: Ifb3d993b085040c17f136dd0f91433762d3d548f
TreeHugger Robot [Mon, 20 Jun 2016 19:49:44 +0000 (19:49 +0000)]
Merge "BatteryStats: record best estimated battery capacity" into nyc-dev
Chad Brubaker [Mon, 20 Jun 2016 19:40:20 +0000 (12:40 -0700)]
Add getApplicationConfigForPackage
getApplicationConfigForPackage will be used by system components that
need to make connections for apps, e.g. DownloadManager, so that their
secure connections have the same configuration as those from the app
itself.
Bug:
29505888
Change-Id: Idf1cac6307431911eda34529d3fd50f9ca0da314
Selim Cinek [Mon, 20 Jun 2016 19:21:56 +0000 (19:21 +0000)]
Merge changes I29ce7659,I2d6310a2,Ic4b29409,I6c5c970f into nyc-dev
am:
3952c3a2d4
Change-Id: I58b2b274bc8c962a4c1a7ce0267146c5464f5ab5
Selim Cinek [Mon, 20 Jun 2016 19:11:48 +0000 (19:11 +0000)]
Merge changes I29ce7659,I2d6310a2,Ic4b29409,I6c5c970f into nyc-dev
* changes:
Fixed a stackoverflow in notifications
Fixed a bug where a notification was incorrectly marked as removed
Fixed a potential issue where a notification could be empty
Fixed a bug where the expanded layout would flash
John Stultz [Mon, 20 Jun 2016 19:11:02 +0000 (19:11 +0000)]
Merge \\"DisplayEventDisplatcher: Quiet down dispatcher Vsync pulse messages\\" am:
cf81fdb37b
am:
8fb95f0fb3
Change-Id: I3b8fcc725ea346dbb18d4372983adf8724ced7e7
Bill Yi [Mon, 20 Jun 2016 19:06:59 +0000 (19:06 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am:
f5314e3b75 -s ours
Change-Id: I11abc446ed1aa66b817cfeb356542f057c6c12c2
Bill Yi [Mon, 20 Jun 2016 19:06:53 +0000 (19:06 +0000)]
Merge \"Import translations. DO NOT MERGE\" into stage-aosp-master
am:
a69a9bdc1f -s ours
Change-Id: I70cf8182d8a81cedbeab7c81f293bb7ed0f9dab7
John Stultz [Mon, 20 Jun 2016 19:05:57 +0000 (19:05 +0000)]
Merge \"DisplayEventDisplatcher: Quiet down dispatcher Vsync pulse messages\"
am:
cf81fdb37b
Change-Id: Ic8992e62cbeebc961bdea5f5e1fbf6dd0ff52145
Steve McKay [Mon, 20 Jun 2016 18:46:56 +0000 (11:46 -0700)]
Make advanced storage option sticky...
...when used from one of the picker modes.
Bug:
29454465
Change-Id: I5f7db04a51023b59121289afd300a13ea071146d
David Brazdil [Mon, 20 Jun 2016 18:52:46 +0000 (18:52 +0000)]
Merge \"Fix NPE in reading package-usage.list file\" into nyc-dev
am:
ec3f8409b8
Change-Id: I2221e3f75471b88b7bcfcc7de34c29294ae601d0
Jason Monk [Mon, 20 Jun 2016 18:52:40 +0000 (18:52 +0000)]
Merge \"QS: Don\'t disable hotspot animation when leaving airplane mode\" into nyc-dev
am:
8c9b6609f1
Change-Id: Ibc13b26fc01700c318f8d82bac0fbeae8183dae3
Treehugger Robot [Mon, 20 Jun 2016 18:44:17 +0000 (18:44 +0000)]
Merge "DisplayEventDisplatcher: Quiet down dispatcher Vsync pulse messages"
TreeHugger Robot [Mon, 20 Jun 2016 18:38:45 +0000 (18:38 +0000)]
Merge "Fix NPE in reading package-usage.list file" into nyc-dev
Bill Yi [Mon, 20 Jun 2016 18:36:23 +0000 (18:36 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Mon, 20 Jun 2016 18:35:57 +0000 (18:35 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Jason Monk [Mon, 20 Jun 2016 18:34:15 +0000 (18:34 +0000)]
Merge "QS: Don't disable hotspot animation when leaving airplane mode" into nyc-dev
Gustav Sennton [Mon, 20 Jun 2016 18:23:44 +0000 (18:23 +0000)]
Merge \"Use newly fetched PackageInfo for loading WebView code.\" into nyc-dev
am:
cdbf412f8e
Change-Id: I35f7d2b136119d94862b531070ed0b739bdbd53d
Dianne Hackborn [Mon, 20 Jun 2016 18:22:40 +0000 (11:22 -0700)]
Fix issue #
29438842: Enter the "am broadcast -a...
...'android.hardware.action.NEW_PICTURE'" to terminal, but does not have a response.
Change-Id: I264f386810237a7abc767f68363afeccda557b9c
Gustav Sennton [Mon, 20 Jun 2016 18:17:05 +0000 (18:17 +0000)]
Merge "Use newly fetched PackageInfo for loading WebView code." into nyc-dev
Chong Zhang [Mon, 20 Jun 2016 18:11:56 +0000 (18:11 +0000)]
Merge \"Make sure fontScale in configuration sent to app is equal to global\" into nyc-dev
am:
7c6692646c
Change-Id: Ia4b4fc716a5d6e8146a1d13fe3ed750c7287e77d
Adrian Roos [Mon, 20 Jun 2016 18:11:52 +0000 (18:11 +0000)]
Merge \"SystemUI: Override notification app name\" into nyc-dev
am:
e416a4200a
Change-Id: I874cdfb2452b4c67377c434b851bb7c5ec51328a
Wale Ogunwale [Mon, 20 Jun 2016 17:45:13 +0000 (10:45 -0700)]
Revert "Don't re-launch activities while the device is sleeping"
This reverts commit
0619545be9adca4458cb627c18c211faad6b6275.
Bug:
29497152
Bug:
28518380
Change-Id: I8684b731b1e9973ead7066dc650eff720f70ac91
Sudheer Shanka [Mon, 20 Jun 2016 17:44:30 +0000 (10:44 -0700)]
Allow call addSharedAccountsFromParentUser with CREATE_USERS permission.
Bug:
29189712
Bug:
29500492
Change-Id: I0fca4951d41c14aa1739e01ca15d674b86a15d7c
Chong Zhang [Mon, 20 Jun 2016 18:02:48 +0000 (18:02 +0000)]
Merge "Make sure fontScale in configuration sent to app is equal to global" into nyc-dev
Adrian Roos [Mon, 20 Jun 2016 18:00:01 +0000 (18:00 +0000)]
Merge "SystemUI: Override notification app name" into nyc-dev
Adam Lesinski [Sat, 18 Jun 2016 00:30:01 +0000 (17:30 -0700)]
BatteryStats: record best estimated battery capacity
Using the coulomb counter, record the estimated max battery
capacity.
Bug:
28743761
Change-Id: I1270b062cf4a1e6fd69ea1da3de11a85a81b3663
Chong Zhang [Fri, 17 Jun 2016 23:24:21 +0000 (16:24 -0700)]
Make sure fontScale in configuration sent to app is equal to global
We don't want the default value 1.0 from empty config to be applied
as an override.
bug:
29367672
Change-Id: Ia9947c24fa9435ba5b208eb9bd05e0b07b574015
Christopher Tate [Mon, 20 Jun 2016 17:35:04 +0000 (17:35 +0000)]
Merge \"Let bmgr inspect the set of whitelisted transports\" into nyc-dev
am:
0f101342e1
Change-Id: Ie0f51529e4cad6f3c68c49b2b1e1d0baca6222b6
Jeff Davidson [Mon, 20 Jun 2016 17:34:58 +0000 (17:34 +0000)]
Merge \"Fix runtime restart when using aggregated net observers.\" into nyc-dev
am:
c2d75c898b
Change-Id: Ie5e3e5e4871b7fe6ec613d7bea97ab73929f6c14