OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge \"Compare intent filter when launching adjacent\" into nyc-dev
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

8 years agoMerge "Compare intent filter when launching adjacent" into nyc-dev
Andrii Kulian [Tue, 21 Jun 2016 05:17:58 +0000 (05:17 +0000)]
Merge "Compare intent filter when launching adjacent" into nyc-dev

8 years agoMerge \"Parse \"vendor/priv-app\" to find privileged applications\" 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

8 years agoMerge "Parse "vendor/priv-app" to find privileged applications" into nyc-dev
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

8 years agoParse "vendor/priv-app" to find privileged applications
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

8 years agoMerge \"Don\'t re-launch stopped activities while the device is sleeping\" into nyc-dev
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

8 years agoMerge "Don't re-launch stopped activities while the device is sleeping" into nyc-dev
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

8 years agoMerge \"MediaPlayer: fix java doc for setPlaybackParams.\" 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

8 years agoMerge "MediaPlayer: fix java doc for setPlaybackParams." into nyc-dev
Wei Jia [Mon, 20 Jun 2016 22:58:32 +0000 (22:58 +0000)]
Merge "MediaPlayer: fix java doc for setPlaybackParams." into nyc-dev

8 years agoMediaPlayer: fix java doc for setPlaybackParams.
Wei Jia [Thu, 16 Jun 2016 22:18:20 +0000 (15:18 -0700)]
MediaPlayer: fix java doc for setPlaybackParams.

Bug: 29032949
Change-Id: I75a59e2a4c75b5e84e2257f8e386d7b05faf9c1b

8 years agoMerge \"Allow call addSharedAccountsFromParentUser with CREATE_USERS permission....
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

8 years agoMerge \"just a reorg of some links to put all Android Studio help button redirects...
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

8 years agoMerge "Allow call addSharedAccountsFromParentUser with CREATE_USERS permission."...
Sudheer Shanka [Mon, 20 Jun 2016 22:38:48 +0000 (22:38 +0000)]
Merge "Allow call addSharedAccountsFromParentUser with CREATE_USERS permission." into nyc-dev

8 years agoMerge \"Fix infinite loop when registering data usage callback.\" 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

8 years agoMerge "just a reorg of some links to put all Android Studio help button redirects...
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

8 years agojust a reorg of some links to put all Android Studio help button redirects together
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

8 years agoMerge "Fix infinite loop when registering data usage callback." into nyc-dev
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

8 years agoMerge \"Fix issue #29438842: Enter the \"am broadcast -a...\" 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

8 years agoMerge "Fix issue #29438842: Enter the "am broadcast -a..." into nyc-dev
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

8 years agoDocs: Changed sample link under Related Samples am: ab5de09e7e am: d5af0a1214
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

8 years agoFix infinite loop when registering data usage callback.
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

8 years agoDocs: Changed sample link under Related Samples am: ab5de09e7e
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

8 years agoDocs: Changed sample link under Related Samples
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

8 years agoMerge \"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\" into nyc-dev
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

8 years agoMerge "Mark Serbian in Latin script as non-localized [DO NOT MERGE]" into nyc-dev
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

8 years agoMerge \\\\\"DO NOT MERGE Disable app pinning when emergency call button pressed\...
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

8 years agoMerge \\\\"DO NOT MERGE Disable app pinning when emergency call button pressed\\...
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

8 years agoMerge \\\"DO NOT MERGE Disable app pinning when emergency call button pressed\\\...
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

8 years agoMerge \"Revert \"Don\'t re-launch activities while the device is sleeping\"\" into...
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

8 years agoMerge \\"DO NOT MERGE Disable app pinning when emergency call button pressed\\" into...
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

8 years agoDon't re-launch stopped activities while the device is sleeping
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

8 years agoMerge \"DO NOT MERGE Disable app pinning when emergency call button pressed\" into...
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

8 years agoMerge "Revert "Don't re-launch activities while the device is sleeping"" into nyc-dev
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

8 years agoMerge "DO NOT MERGE Disable app pinning when emergency call button pressed" into...
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

8 years agoMerge \"Make advanced storage option sticky...\" into nyc-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

8 years agoMerge "Make advanced storage option sticky..." into nyc-dev
TreeHugger Robot [Mon, 20 Jun 2016 20:45:03 +0000 (20:45 +0000)]
Merge "Make advanced storage option sticky..." into nyc-dev

8 years agoMerge \"docs: Narnia 2 advertising language update\" 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

8 years agoMerge "docs: Narnia 2 advertising language update" into nyc-dev
Joe Fernandez [Mon, 20 Jun 2016 20:13:08 +0000 (20:13 +0000)]
Merge "docs: Narnia 2 advertising language update" into nyc-dev

8 years agoMerge \"BatteryStats: record best estimated battery capacity\" 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

8 years agoMerge "BatteryStats: record best estimated battery capacity" into nyc-dev
TreeHugger Robot [Mon, 20 Jun 2016 19:49:44 +0000 (19:49 +0000)]
Merge "BatteryStats: record best estimated battery capacity" into nyc-dev

8 years agoMerge changes I29ce7659,I2d6310a2,Ic4b29409,I6c5c970f into nyc-dev
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

8 years agoMerge changes I29ce7659,I2d6310a2,Ic4b29409,I6c5c970f into nyc-dev
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

8 years agoMerge \\"DisplayEventDisplatcher: Quiet down dispatcher Vsync pulse messages\\" am...
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

8 years agoMerge \"Import translations. DO NOT MERGE\" into stage-aosp-master
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

8 years agoMerge \"Import translations. DO NOT MERGE\" into stage-aosp-master
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

8 years agoMerge \"DisplayEventDisplatcher: Quiet down dispatcher Vsync pulse messages\"
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

8 years agoMake advanced storage option sticky...
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

8 years agoMerge \"Fix NPE in reading package-usage.list file\" into nyc-dev
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

8 years agoMerge \"QS: Don\'t disable hotspot animation when leaving airplane mode\" into nyc-dev
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

8 years agoMerge "DisplayEventDisplatcher: Quiet down dispatcher Vsync pulse messages"
Treehugger Robot [Mon, 20 Jun 2016 18:44:17 +0000 (18:44 +0000)]
Merge "DisplayEventDisplatcher: Quiet down dispatcher Vsync pulse messages"

8 years agoMerge "Fix NPE in reading package-usage.list file" into nyc-dev
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

8 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Mon, 20 Jun 2016 18:36:23 +0000 (18:36 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

8 years agoMerge "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

8 years agoMerge "QS: Don't disable hotspot animation when leaving airplane mode" into nyc-dev
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

8 years agoMerge \"Use newly fetched PackageInfo for loading WebView code.\" 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

8 years agoFix issue #29438842: Enter the "am broadcast -a...
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

8 years agoMerge "Use newly fetched PackageInfo for loading WebView code." into nyc-dev
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

8 years agoMerge \"Make sure fontScale in configuration sent to app is equal to global\" into...
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

8 years agoMerge \"SystemUI: Override notification app name\" into nyc-dev
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

8 years agoRevert "Don't re-launch activities while the device is sleeping"
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

8 years agoAllow call addSharedAccountsFromParentUser with CREATE_USERS permission.
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

8 years agoMerge "Make sure fontScale in configuration sent to app is equal to global" into...
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

8 years agoMerge "SystemUI: Override notification app name" 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

8 years agoBatteryStats: record best estimated battery capacity
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

8 years agoMake sure fontScale in configuration sent to app is equal to global
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

8 years agoMerge \"Let bmgr inspect the set of whitelisted transports\" into nyc-dev
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

8 years agoMerge \"Fix runtime restart when using aggregated net observers.\" into nyc-dev
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

8 years agoMerge \"Don\'t reference variables before they are assigned.\" into nyc-dev
Julia Reynolds [Mon, 20 Jun 2016 17:34:55 +0000 (17:34 +0000)]
Merge \"Don\'t reference variables before they are assigned.\" into nyc-dev
am: 2d5c95f5b9

Change-Id: I2d379ee7b02ebde5020ef94e333fff671b9c96b6

8 years agoMerge \"PackageManager: Don\'t fail app installs if dexopt fails.\" into nyc-dev
Narayan Kamath [Mon, 20 Jun 2016 17:30:40 +0000 (17:30 +0000)]
Merge \"PackageManager: Don\'t fail app installs if dexopt fails.\" into nyc-dev
am: 5ae42bb661

Change-Id: I9b354c1bb42a17d020e40899526f9d9c61572db8

8 years agoRemove @return from void API javadoc
Robin Lee [Mon, 20 Jun 2016 17:30:34 +0000 (17:30 +0000)]
Remove @return from void API javadoc
am: 6918675fa1

Change-Id: Ie91f340ac28868a00197898b662cb809c750ec65

8 years agoMerge \"QS: Fix missing tiles\" into nyc-dev
Jason Monk [Mon, 20 Jun 2016 17:30:27 +0000 (17:30 +0000)]
Merge \"QS: Fix missing tiles\" into nyc-dev
am: bd04ec31bd

Change-Id: Iab076b534faf6ffa9496e9104674544b97a8c970

8 years agoMerge \"Fix for the missing sync bug\" into nyc-dev
Shreyas Basarge [Mon, 20 Jun 2016 17:30:21 +0000 (17:30 +0000)]
Merge \"Fix for the missing sync bug\" into nyc-dev
am: 70b6cd903e

Change-Id: Iea3af329cf5aaf370c4454ef35f8c35c36b6d04c

8 years agoMerge \"assume a generous prior in the rate estimator\" into nyc-dev
Chris Wren [Mon, 20 Jun 2016 17:30:15 +0000 (17:30 +0000)]
Merge \"assume a generous prior in the rate estimator\" into nyc-dev
am: fddf5df01f

Change-Id: I4a526dd0467a6f57e9e919817f87d643071ae81b

8 years agoMerge "Let bmgr inspect the set of whitelisted transports" into nyc-dev
Chris Tate [Mon, 20 Jun 2016 17:19:50 +0000 (17:19 +0000)]
Merge "Let bmgr inspect the set of whitelisted transports" into nyc-dev

8 years agoFix NPE in reading package-usage.list file
David Brazdil [Mon, 20 Jun 2016 13:06:42 +0000 (14:06 +0100)]
Fix NPE in reading package-usage.list file

A zero-length file is a valid package usage file of version 0 but
checking against the version 1 magic would throw a NPE.

Bug: 29491065
Change-Id: Ie54b1dd3218e4b1251c29db0c784a5ddf605394f

8 years agoMerge "Fix runtime restart when using aggregated net observers." into nyc-dev
Jeff Davidson [Mon, 20 Jun 2016 16:56:13 +0000 (16:56 +0000)]
Merge "Fix runtime restart when using aggregated net observers." into nyc-dev

8 years agoQS: Don't disable hotspot animation when leaving airplane mode
Jason Monk [Mon, 20 Jun 2016 16:39:38 +0000 (12:39 -0400)]
QS: Don't disable hotspot animation when leaving airplane mode

Change-Id: I80750e3c4d63e4d590b43e3ed595100e054e5b1e
Fixes: 29374561

8 years agoMerge "Don't reference variables before they are assigned." into nyc-dev
Julia Reynolds [Mon, 20 Jun 2016 16:40:29 +0000 (16:40 +0000)]
Merge "Don't reference variables before they are assigned." into nyc-dev

8 years agodocs: Narnia 2 advertising language update
Joe Fernandez [Mon, 20 Jun 2016 16:08:46 +0000 (09:08 -0700)]
docs: Narnia 2 advertising language update

b/29009702

Change-Id: Icd060074413c53d6ad24e2919dc80be949a2260c

8 years agoMerge "PackageManager: Don't fail app installs if dexopt fails." into nyc-dev
Narayan Kamath [Mon, 20 Jun 2016 15:19:29 +0000 (15:19 +0000)]
Merge "PackageManager: Don't fail app installs if dexopt fails." into nyc-dev

8 years agoRemove @return from void API javadoc
Robin Lee [Fri, 17 Jun 2016 11:54:21 +0000 (12:54 +0100)]
Remove @return from void API javadoc

Fix: 29500429
Change-Id: Ieddf211ad881e2e48bf593dcde6d262dd5be6c5c
(cherry picked from commit b3d6b13ad5fffaad82da4c060ba1a064a445456a)

8 years agoDon't reference variables before they are assigned.
Julia Reynolds [Mon, 20 Jun 2016 13:39:37 +0000 (09:39 -0400)]
Don't reference variables before they are assigned.

Rare but technically possible.

Change-Id: I375cd1ac0bef5b6c7295618bef087554114c3cdd
Fixes: 29394773

8 years agoUse newly fetched PackageInfo for loading WebView code.
Gustav Sennton [Fri, 17 Jun 2016 13:02:52 +0000 (14:02 +0100)]
Use newly fetched PackageInfo for loading WebView code.

During a time window between the point at which a webview package
becomes updated and the WebViewUpdateService receiving an intent
declaring this action the WebViewUpdateService APIs will return a
PackageInfo pointing to an old and possibly removed WebView package.
This means that any paths that PackageInfo is referring to could have
been removed.

Currently, we set WebViewFactory.sPackageInfo using one of these APIs
and we might thus try to use deleted paths to to load WebView. This can
cause crashes, so instead fetch a fresh PackageInfo and assign
WebViewFactory.sPackageInfo to that.

Also early-out in loadWebViewNativeLibraryFromPackage if the current
package version doesn't match that of the one fetched from the
WebViewUpdateService.

Bug: 29381682
Change-Id: I2713ce2338a4a96c5317dcdbb363b424513088d5

8 years agoMerge "QS: Fix missing tiles" into nyc-dev
Jason Monk [Mon, 20 Jun 2016 13:26:02 +0000 (13:26 +0000)]
Merge "QS: Fix missing tiles" into nyc-dev

8 years agoPackageManager: Don't fail app installs if dexopt fails.
Narayan Kamath [Mon, 20 Jun 2016 12:33:50 +0000 (13:33 +0100)]
PackageManager: Don't fail app installs if dexopt fails.

bug: 29493857
Change-Id: I953de204319b943d9389bb4c787f859e169e8d21

8 years agoMerge "Fix for the missing sync bug" into nyc-dev
Shreyas Basarge [Mon, 20 Jun 2016 09:17:20 +0000 (09:17 +0000)]
Merge "Fix for the missing sync bug" into nyc-dev

8 years agoMerge "assume a generous prior in the rate estimator" into nyc-dev
Chris Wren [Sat, 18 Jun 2016 19:28:16 +0000 (19:28 +0000)]
Merge "assume a generous prior in the rate estimator" into nyc-dev

8 years agoFixed a stackoverflow in notifications
Selim Cinek [Sat, 18 Jun 2016 04:01:32 +0000 (21:01 -0700)]
Fixed a stackoverflow in notifications

Change-Id: I29ce76593af81ad6e326d2e273fd872a4d9d4a89
Fixes: 29464060

8 years agoFixed a bug where a notification was incorrectly marked as removed
Selim Cinek [Sat, 18 Jun 2016 03:04:16 +0000 (20:04 -0700)]
Fixed a bug where a notification was incorrectly marked as removed

When unauto-bundled, it could lead to serious bugs on the lockscreen
and the header not being restored.

Change-Id: I2d6310a2bcb2f3a60402db5f1e522954f8bd0389
Fixes: 29463339

8 years agoMerge \"DO NOT MERGE Move SurfaceView offscreen if the app stops drawing it\" into...
John Reck [Sat, 18 Jun 2016 02:14:29 +0000 (02:14 +0000)]
Merge \"DO NOT MERGE Move SurfaceView offscreen if the app stops drawing it\" into nyc-dev
am: d11b5e6661

Change-Id: I1caf2fbac785c68c6afeb61b60493e728a83a670

8 years agoMerge "DO NOT MERGE Move SurfaceView offscreen if the app stops drawing it" into...
TreeHugger Robot [Sat, 18 Jun 2016 02:07:04 +0000 (02:07 +0000)]
Merge "DO NOT MERGE Move SurfaceView offscreen if the app stops drawing it" into nyc-dev

8 years agoMerge \"Avoid re-calculating vsync mid-frame\" into nyc-dev
John Reck [Sat, 18 Jun 2016 02:05:17 +0000 (02:05 +0000)]
Merge \"Avoid re-calculating vsync mid-frame\" into nyc-dev
am: fc275d244e

Change-Id: Ic46d2d9627c4dcbd345b49f01af0bf3b8247259c

8 years agoMerge "Avoid re-calculating vsync mid-frame" into nyc-dev
TreeHugger Robot [Sat, 18 Jun 2016 02:00:59 +0000 (02:00 +0000)]
Merge "Avoid re-calculating vsync mid-frame" into nyc-dev

8 years agoFixed a potential issue where a notification could be empty
Selim Cinek [Sat, 18 Jun 2016 01:02:12 +0000 (18:02 -0700)]
Fixed a potential issue where a notification could be empty

Change-Id: Ic4b294092a47d30c469dfbd1eb6ab31208533b1c
Fixes: 29158425\10

8 years agoMerge \"Fix a race in local settings caches\" into nyc-dev
Svetoslav Ganov [Sat, 18 Jun 2016 00:38:28 +0000 (00:38 +0000)]
Merge \"Fix a race in local settings caches\" into nyc-dev
am: f4ddb7ce30

Change-Id: Ia973ef68382ac359908b83be3dbca485c91d5cd6

8 years agoMark Serbian in Latin script as non-localized [DO NOT MERGE]
Roozbeh Pournader [Sat, 18 Jun 2016 00:34:13 +0000 (17:34 -0700)]
Mark Serbian in Latin script as non-localized [DO NOT MERGE]

Serbian in Latin script is only partially localized in Android N. We
should not show it as localized in either Setup Wizard or Settings.

Bug: 29460424
Change-Id: I6829a89c49c1b5e8768b1527daa3aa9508deb491

8 years agoMerge "Fix a race in local settings caches" into nyc-dev
TreeHugger Robot [Sat, 18 Jun 2016 00:30:26 +0000 (00:30 +0000)]
Merge "Fix a race in local settings caches" into nyc-dev

8 years agoMerge \"Fix race with BT disable in BLE_ON_STATE\" into nyc-dev
Calvin On [Sat, 18 Jun 2016 00:20:14 +0000 (00:20 +0000)]
Merge \"Fix race with BT disable in BLE_ON_STATE\" into nyc-dev
am: 1bf8782605

Change-Id: I9d82cab156e81e87faf965ed1c9b37bc73359cc0

8 years agoMerge "Fix race with BT disable in BLE_ON_STATE" into nyc-dev
Andre Eisenbach [Sat, 18 Jun 2016 00:15:18 +0000 (00:15 +0000)]
Merge "Fix race with BT disable in BLE_ON_STATE" into nyc-dev

8 years agoMerge \"Fix data race\" into nyc-dev
Adrian Roos [Fri, 17 Jun 2016 23:50:12 +0000 (23:50 +0000)]
Merge \"Fix data race\" into nyc-dev
am: 838dfe60f0

Change-Id: I4aa6d76b855bcbb9d570ddcfcf8f8c61c135930d