OSDN Git Service
TreeHugger Robot [Tue, 21 Jun 2016 16:52:39 +0000 (16:52 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 21 Jun 2016 16:52:26 +0000 (16:52 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Fan Zhang [Tue, 21 Jun 2016 15:28:29 +0000 (15:28 +0000)]
Merge "Add metrics for button taps in Settings support tab." into nyc-mr1-dev
Alan Viverette [Tue, 21 Jun 2016 13:53:49 +0000 (13:53 +0000)]
Merge \"Only block invalidation in DrawableContainer initialization\" into nyc-dev
am:
7a372a13af
Change-Id: I21a7dbf975a8dca02d87b9a0f084a6af74d55834
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:58:53 +0000 (11:58 +0000)]
Merge \\\"Documented how to handle advertisements during audio playback.\\\" into mnc-io-docs am:
07340a654a am:
5fef4a7d44
am:
41a7bdec97
Change-Id: Ic6578db4f8d59387974be01b74bd28b86abde176
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
Andrei Stingaceanu [Tue, 21 Jun 2016 09:28:58 +0000 (09:28 +0000)]
Merge "Keyboard shortcuts: A11Y fixes cherry pick" into nyc-mr1-dev
Chris Banes [Mon, 20 Jun 2016 09:38:02 +0000 (10:38 +0100)]
Fix NPE in Toolbar - framework edition
Caused by super constructor calling non-final methods
which Toolbar overrides, and then tries to reference
final variables.
BUG:
28806107
Change-Id: Ieaf5f7611dbbf954e49c31e604aa2f7627248615
Bill Yi [Tue, 21 Jun 2016 08:08:26 +0000 (01:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I09c2d72040aabd804cc592de9b61f9a41cb60fc8
Auto-generated-cl: translation import
Bill Yi [Tue, 21 Jun 2016 07:45:59 +0000 (00:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4d7cc365a08a8c59e242fc7450606a549812799a
Auto-generated-cl: translation import
Andrii Kulian [Tue, 21 Jun 2016 05:27:24 +0000 (05:27 +0000)]
Merge \"Compare intent filter when launching adjacent\" into nyc-dev
am:
9980514ee0
Change-Id: I8c2b03438fdeed6bce12489c5639245b79097577
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:41 +0000 (03:02 +0000)]
Merge \"Parse \"vendor/priv-app\" to find privileged applications\" into nyc-dev
am:
8a1bc54ab0
Change-Id: I651efd38fa6dd6433a13e5eb7569d882866cbc1e
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
TreeHugger Robot [Tue, 21 Jun 2016 01:51:57 +0000 (01:51 +0000)]
Merge "Enable fingerprint nav by default" into nyc-mr1-dev
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:07:55 +0000 (23:07 +0000)]
Merge \"Don\'t re-launch stopped activities while the device is sleeping\" into nyc-dev
am:
f159b74608
Change-Id: I83edfb392f0f179b4c28aaab3eba0c51fe11d207
Wei Jia [Mon, 20 Jun 2016 23:07:53 +0000 (23:07 +0000)]
Merge \"MediaPlayer: fix java doc for setPlaybackParams.\" into nyc-dev
am:
bd45be5032
Change-Id: I23b24e3430335e037809da0c0721bf1de0e529dd
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 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:49:34 +0000 (22:49 +0000)]
Merge \"Allow call addSharedAccountsFromParentUser with CREATE_USERS permission.\" into nyc-dev
am:
f00e780472
Change-Id: I542e11688a52dd3cde8fd8c3df252b2ead0e5240
smain@google.com [Mon, 20 Jun 2016 22:43:05 +0000 (22:43 +0000)]
Merge \"just a reorg of some links to put all Android Studio help button redirects together\" into nyc-dev
am:
db4ef3f4f8
Change-Id: Ie519bb30a4fc09c98901098b7124dfd5fef39238
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:45 +0000 (22:29 +0000)]
Merge \"Fix infinite loop when registering data usage callback.\" into nyc-dev
am:
c20ffc2a9e
Change-Id: I3839e516a128befbfe677b17b05a557b9e0afd87
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:21:53 +0000 (22:21 +0000)]
Merge \"Fix issue #
29438842: Enter the \"am broadcast -a...\" into nyc-dev
am:
d2480ab7bb
Change-Id: I57f8a28b73cb91f6602f7ac9dce67bdb5ea545aa
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
Roozbeh Pournader [Mon, 20 Jun 2016 22:08:21 +0000 (22:08 +0000)]
Merge "Revert "Mark Serbian in Latin script as non-localized [DO NOT MERGE]"" into nyc-mr1-dev
Hemal Patel [Mon, 20 Jun 2016 22:04:37 +0000 (22:04 +0000)]
Docs: Changed sample link under Related Samples am:
ab5de09e7e am:
d5af0a1214
am:
2a3336813a
Change-Id: Ie48aea195c987e29155013f699c36272dddc432e
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
Roozbeh Pournader [Mon, 20 Jun 2016 21:59:29 +0000 (14:59 -0700)]
Revert "Mark Serbian in Latin script as non-localized [DO NOT MERGE]"
This reverts commit
e977b0ae59bbd7af0ccdf56db6aa0a53c5e6414d for MR1.
The original commit is only intended for N, not MR1.
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:42 +0000 (21:44 +0000)]
Merge \"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\" into nyc-dev
am:
160126e2d8
Change-Id: I9e26a77ba4e186a9e3fd59b9618b3eb36127178f
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:44 +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: I78ee2340cb7a4a42eb9c60d41a7947b9bb6f6a11
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
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:20:29 +0000 (21:20 +0000)]
Merge \"Revert \"Don\'t re-launch activities while the device is sleeping\"\" into nyc-dev
am:
beaf3707fa
Change-Id: I50f6a45a56650569047c046d275f39b0929c38e4
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
Makoto Onuki [Mon, 20 Jun 2016 21:06:40 +0000 (21:06 +0000)]
Merge "Launcher shortcut callback should deliver manifest shortcuts too" into nyc-mr1-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:54:09 +0000 (20:54 +0000)]
Merge \"Make advanced storage option sticky...\" into nyc-dev
am:
361ccf5eef
Change-Id: Ibc7ebfa9d5f68014592b4fb8793358be5436efce
TreeHugger Robot [Mon, 20 Jun 2016 20:45:03 +0000 (20:45 +0000)]
Merge "Make advanced storage option sticky..." into nyc-dev
Jim Miller [Mon, 20 Jun 2016 20:28:10 +0000 (13:28 -0700)]
Enable fingerprint nav by default
Fixes bug
29462383
Change-Id: Ia1cbd1d33ab3a11b5c8e5a770243d9b36448577b
Joe Fernandez [Mon, 20 Jun 2016 20:22:05 +0000 (20:22 +0000)]
Merge \"docs: Narnia 2 advertising language update\" into nyc-dev
am:
ebad16f3c0
Change-Id: Iafe2096dc792ff57a4a9065e88916c7ca7330e79
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: I4f590635c720ddbb6dfac292753606b9d3fe16e0
TreeHugger Robot [Mon, 20 Jun 2016 19:49:44 +0000 (19:49 +0000)]
Merge "BatteryStats: record best estimated battery capacity" into nyc-dev
Roozbeh Pournader [Mon, 20 Jun 2016 19:22:24 +0000 (19:22 +0000)]
Merge "Fix AAPT-compatible output format for locales" into nyc-mr1-dev
Selim Cinek [Mon, 20 Jun 2016 19:17:32 +0000 (19:17 +0000)]
Merge changes I29ce7659,I2d6310a2,Ic4b29409,I6c5c970f into nyc-dev
am:
3952c3a2d4
Change-Id: I6647a1410723a229a7ac6ebf89d4495cb508efd9
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
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:51:20 +0000 (18:51 +0000)]
Merge \"Fix NPE in reading package-usage.list file\" into nyc-dev
am:
ec3f8409b8
Change-Id: I29238af5df6b96a28960edfadfb1c66f595a670f
Jason Monk [Mon, 20 Jun 2016 18:51:16 +0000 (18:51 +0000)]
Merge \"QS: Don\'t disable hotspot animation when leaving airplane mode\" into nyc-dev
am:
8c9b6609f1
Change-Id: I6b3146f6f082732967af0375ab745e8cd11bc71e
TreeHugger Robot [Mon, 20 Jun 2016 18:45:02 +0000 (18:45 +0000)]
Merge "fix resolver" into nyc-mr1-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
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
Android Build Merger (Role) [Mon, 20 Jun 2016 18:23:47 +0000 (18:23 +0000)]
Merge "Merge \"Use newly fetched PackageInfo for loading WebView code.\" into nyc-dev am:
cdbf412f8e" into nyc-mr1-dev
Gustav Sennton [Mon, 20 Jun 2016 18:23:26 +0000 (18:23 +0000)]
Merge \"Use newly fetched PackageInfo for loading WebView code.\" into nyc-dev
am:
cdbf412f8e
Change-Id: Ia7ced5f34f7f97e788d48bc0239dfcb640bbdaa6
Trevor Bunker [Mon, 20 Jun 2016 18:23:16 +0000 (18:23 +0000)]
Merge "Enable tap-to-pulse only when needed" into nyc-mr1-dev
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
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:10:39 +0000 (18:10 +0000)]
Merge \"Make sure fontScale in configuration sent to app is equal to global\" into nyc-dev
am:
7c6692646c
Change-Id: I6b0cbd28de6108bd938d6e620e10b06cfaa86c45
Adrian Roos [Mon, 20 Jun 2016 18:10:36 +0000 (18:10 +0000)]
Merge \"SystemUI: Override notification app name\" into nyc-dev
am:
e416a4200a
Change-Id: Ie9977a67456c5a10ca4b9226a0f328f4b594557b
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:36:58 +0000 (17:36 +0000)]
Merge \"Let bmgr inspect the set of whitelisted transports\" into nyc-dev
am:
0f101342e1
Change-Id: I5249aed8cf49c0da111324d5c6ab43b46cdb1196
Jeff Davidson [Mon, 20 Jun 2016 17:36:55 +0000 (17:36 +0000)]
Merge \"Fix runtime restart when using aggregated net observers.\" into nyc-dev
am:
c2d75c898b
Change-Id: I120dcc3453182933b0ca277a3b68b42c026dee6a
Julia Reynolds [Mon, 20 Jun 2016 17:36:51 +0000 (17:36 +0000)]
Merge \"Don\'t reference variables before they are assigned.\" into nyc-dev
am:
2d5c95f5b9
Change-Id: I18651fef3ca880ee287d89f0ab4ba80f94f1dced
Narayan Kamath [Mon, 20 Jun 2016 17:33:26 +0000 (17:33 +0000)]
Merge \"PackageManager: Don\'t fail app installs if dexopt fails.\" into nyc-dev
am:
5ae42bb661
Change-Id: I7892f2f35f6f43d98d4a01ff9c5bb64df486d11b
Robin Lee [Mon, 20 Jun 2016 17:33:24 +0000 (17:33 +0000)]
Remove @return from void API javadoc
am:
6918675fa1
Change-Id: I70f711ac3bc16d2e2a524de21e5fb8b3548270dc
Jason Monk [Mon, 20 Jun 2016 17:33:22 +0000 (17:33 +0000)]
Merge \"QS: Fix missing tiles\" into nyc-dev
am:
bd04ec31bd
Change-Id: I7889f69b9f216016ab23e95420e6c1b90f58769b
Shreyas Basarge [Mon, 20 Jun 2016 17:33:19 +0000 (17:33 +0000)]
Merge \"Fix for the missing sync bug\" into nyc-dev
am:
70b6cd903e
Change-Id: I5b57674eccd5e84bde033bb3277f88d86349a6b3
Chris Wren [Mon, 20 Jun 2016 17:33:15 +0000 (17:33 +0000)]
Merge \"assume a generous prior in the rate estimator\" into nyc-dev
am:
fddf5df01f
Change-Id: I73dc1cb6a2a13bac21ff576319e7b9123aee09b3
Christine Hallstrom [Mon, 20 Jun 2016 17:23:00 +0000 (17:23 +0000)]
Merge "Fix early termination of while loop in BluetoothSocket#write" into nyc-mr1-dev
Andrei Stingaceanu [Mon, 13 Jun 2016 16:26:39 +0000 (17:26 +0100)]
Keyboard shortcuts: A11Y fixes cherry pick
* Letters are no more announced as capitals
* Focus now moves into the function key buttons (images)
* The keyboard shortcuts are not being verbalized individually
but instead the whole group is now verbalized in one go.
Bug:
29267887
Bug:
29259734
Bug:
29260915
Change-Id: If9370fa9a6eef0e412285ca73794c6d72cdadd15
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
Andrew Sapperstein [Mon, 20 Jun 2016 17:15:04 +0000 (17:15 +0000)]
Merge "Use colorAccent for fullscreen tutorial." into nyc-mr1-dev
Todd Kennedy [Mon, 20 Jun 2016 17:06:06 +0000 (10:06 -0700)]
fix resolver
Change-Id: I31649d0f85b7b6553a6ecf38fd7c08279b85a0a6
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
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
Fan Zhang [Thu, 16 Jun 2016 23:48:38 +0000 (16:48 -0700)]
Add metrics for button taps in Settings support tab.
Bug:
29282762
Change-Id: I62f840fbc312ce759b5e6559e26d916181739d75
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
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
Makoto Onuki [Fri, 17 Jun 2016 20:47:40 +0000 (13:47 -0700)]
Launcher shortcut callback should deliver manifest shortcuts too
- Also include "activity" in the key fields, as this is now an
important field.
- Also optimize ShortcutInfo parceling for the "key field only" case.
Bug
29394043
Bug
29451629
Change-Id: I61b2bc2f61ad6ebdcbaf6d02f1bd88777c45a7f0
OSDN Git Service
