OSDN Git Service
Mihai Popa [Wed, 11 Apr 2018 22:27:59 +0000 (15:27 -0700)]
Merge "Fix ripple effect for floating toolbar menu items" into pi-dev
am:
6afcf2fb4d
Change-Id: Ic94b1ca619219268a1af233b61cc8df1f380c980
Jovana Knezevic [Wed, 11 Apr 2018 22:18:24 +0000 (15:18 -0700)]
Merge "Separates current process user and foreground user" into pi-dev
am:
a512d304ca
Change-Id: Id876cfb4c06ffae5f2268fb53a6cfaddfd15bd4d
Mihai Popa [Wed, 11 Apr 2018 22:14:51 +0000 (22:14 +0000)]
Merge "Fix ripple effect for floating toolbar menu items" into pi-dev
Jovana Knezevic [Wed, 11 Apr 2018 22:06:15 +0000 (22:06 +0000)]
Merge "Separates current process user and foreground user" into pi-dev
Tracy Zhou [Wed, 11 Apr 2018 21:49:22 +0000 (14:49 -0700)]
Merge "Update the recents onboarding UI to the latest mock." into pi-dev
am:
68e4c45eed
Change-Id: I0e4a58951718d2522ba4f181e8f329460d1f1b9c
Rohan Shah [Wed, 11 Apr 2018 21:44:19 +0000 (14:44 -0700)]
Merge "[QS] Update mobile tile secondary text" into pi-dev
am:
497bc2cbe9
Change-Id: Ice200394d0acf6168da955442cc1ada308c181f7
Jeff Sharkey [Wed, 11 Apr 2018 21:38:27 +0000 (14:38 -0700)]
Merge "Lint to identify "deprecated at birth" APIs." into pi-dev
am:
992f6120c0
Change-Id: I0f734d9a3d6746d5d828919b74d2603eba0bcf02
TreeHugger Robot [Wed, 11 Apr 2018 21:36:31 +0000 (21:36 +0000)]
Merge "Update the recents onboarding UI to the latest mock." into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 21:29:20 +0000 (21:29 +0000)]
Merge "[QS] Update mobile tile secondary text" into pi-dev
Jeff Sharkey [Wed, 11 Apr 2018 21:25:51 +0000 (21:25 +0000)]
Merge "Lint to identify "deprecated at birth" APIs." into pi-dev
Philip P. Moltmann [Wed, 11 Apr 2018 20:54:01 +0000 (13:54 -0700)]
Merge "Properly disconnect after skipping an operation." into pi-dev
am:
cd7a174c59
Change-Id: Ida1308d4746001e818177bf6cdbfa0ec85a2afe2
TreeHugger Robot [Wed, 11 Apr 2018 20:44:32 +0000 (20:44 +0000)]
Merge "Properly disconnect after skipping an operation." into pi-dev
Hall Liu [Wed, 11 Apr 2018 20:30:18 +0000 (13:30 -0700)]
Merge "Make setServiceId a TestApi" into pi-dev
am:
d41e669fca
Change-Id: I0ca985c9741b3f710c636595b7eb9b2b326e67fb
Sunny Goyal [Wed, 11 Apr 2018 20:22:37 +0000 (13:22 -0700)]
Merge "Fixing missing reportDrawFinish method in windowCallbacksCompat" into pi-dev
am:
5000367d38
Change-Id: I4c2d4cbef2f3cae9c9f61c1a5fa5126b26d10aa7
Hall Liu [Wed, 11 Apr 2018 20:21:48 +0000 (20:21 +0000)]
Merge "Make setServiceId a TestApi" into pi-dev
Android Build Merger (Role) [Wed, 11 Apr 2018 20:09:25 +0000 (20:09 +0000)]
Merge "Merge "Cleanup after updating Vehicle permissions" into pi-dev am:
8b73c1126a" into pi-dev-plus-aosp
Kai [Wed, 11 Apr 2018 20:08:04 +0000 (13:08 -0700)]
Merge "Cleanup after updating Vehicle permissions" into pi-dev
am:
8b73c1126a
Change-Id: I5687a87169717d7dd55166c2b0c2a57aecbfa452
Erik Kline [Wed, 11 Apr 2018 20:05:45 +0000 (13:05 -0700)]
[automerger skipped] Don't unnecessarily reevaluate tethering provisioning
am:
1b450e3eb9 -s ours
Change-Id: I4a2b78be3a8d5fc07398d2d070fca90e0c11c6fb
Sunny Goyal [Wed, 11 Apr 2018 20:01:01 +0000 (20:01 +0000)]
Merge "Fixing missing reportDrawFinish method in windowCallbacksCompat" into pi-dev
Julia Reynolds [Wed, 11 Apr 2018 19:55:55 +0000 (12:55 -0700)]
Merge "Show onboarding screen from dnd tile" into pi-dev
am:
b2943a864e
Change-Id: I38450b8983c6be32d0a5a7fca757eb031764c13a
TreeHugger Robot [Wed, 11 Apr 2018 19:50:50 +0000 (19:50 +0000)]
Merge "Cleanup after updating Vehicle permissions" into pi-dev
Daniel Cashman [Wed, 11 Apr 2018 19:40:33 +0000 (12:40 -0700)]
Merge "Add SigningInfo class to expose package signing details." into pi-dev
am:
960a0c6c57
Change-Id: I512db4ad4f81da5cdd61bb2de5f3ed0e719379c1
Julia Reynolds [Wed, 11 Apr 2018 19:36:41 +0000 (19:36 +0000)]
Merge "Show onboarding screen from dnd tile" into pi-dev
Jack Yu [Wed, 11 Apr 2018 19:29:29 +0000 (12:29 -0700)]
Merge "DO NOT MERGE - Hide IWLAN system API" into pi-dev
am:
10fb6582eb
Change-Id: Ica3ee854446d0a2f0b596d2c7bc6381ebf963584
Yangster-mac [Wed, 11 Apr 2018 19:24:31 +0000 (12:24 -0700)]
Merge "Trim the invalid uids and tags when reading uids/tags from chain." into pi-dev
am:
9054656c20
Change-Id: I3c67a3842b3444d1dbc068917500db908a383b9c
Daniel Cashman [Wed, 11 Apr 2018 19:21:07 +0000 (19:21 +0000)]
Merge "Add SigningInfo class to expose package signing details." into pi-dev
David Pursell [Wed, 11 Apr 2018 19:19:21 +0000 (12:19 -0700)]
Merge "MessageQueue: explicitly remove FD event listeners." into pi-dev
am:
6f42d1bac2
Change-Id: Ia2f49f6d20d495fcc01e1a5a42a0be207042c92f
Shawn Willden [Wed, 11 Apr 2018 19:13:54 +0000 (12:13 -0700)]
Merge "Mark CTS-tested APIs as @TestApi" into pi-dev
am:
98831af78b
Change-Id: Ia2cd2684380aca372e912af9aeda343246df924e
Wei Jia [Wed, 11 Apr 2018 19:08:14 +0000 (12:08 -0700)]
Merge "BufferingParams: add annotation @TestApi" into pi-dev
am:
fb052cc3c0
Change-Id: I292beb9a2e88c2ca680412002e82ec4426ec9cf6
Erik Kline [Wed, 28 Feb 2018 06:01:35 +0000 (15:01 +0900)]
Don't unnecessarily reevaluate tethering provisioning
Registering for carrier config changes can deliver a sticky broadcast
and can cause Tethering to think something has changed and reevaluate
provisioning status, even though this has been checked before it
entered tethering mode alive state.
Additionally, move the provisioning_app{,no_ui} resources into the
TetheringConfiguration, if for no other reason than now we can log
it in .toString().
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
- manual USB tethering toward WiFi works
Bug:
69565814
Merged-In: If254326e892b78ef9daf620f829c1def136d695c
Merged-In: I288093a1d76566e72d4889d92c7aedafc318c8b6
Change-Id: I01c71fd971a4683bb2b6d14825d36f24a04d88a8
Jason Monk [Wed, 11 Apr 2018 18:56:07 +0000 (11:56 -0700)]
Merge "Fix docs and bug in SliceManager#bindSlice" into pi-dev
am:
c2375d9b3d
Change-Id: Id7145e9d6432586d295f59b67a4f3b7e44d935b1
jovanak [Mon, 2 Apr 2018 23:40:15 +0000 (16:40 -0700)]
Separates current process user and foreground user
User switcher wrongly called methods on the current process user,
which is always User 0 for SysUI.
Instead, user switcher requires knowledge about foreground user.
The process of user switching = changing the foreground
user.
Split tests between unit and robolectric.
Robolectric tests enable shadowing ActivityManager and UserHandle.
Fixes:
77485524
Test: Unit and robolectric tests.
Change-Id: I20cc32f132ce48b4507a6907bdc9d103c04f4a30
Colin Cross [Wed, 11 Apr 2018 18:44:45 +0000 (11:44 -0700)]
Merge "Revert "Update docs to match encryption requirements"" into pi-dev
am:
fcbbb72603
Change-Id: I7b66ab3cb2362a6fa91d90b4b7237d6f3760b406
Nathan Harold [Wed, 11 Apr 2018 18:39:56 +0000 (11:39 -0700)]
Merge "[DO NOT MERGE] - Hide Tunnel Mode IpSec API" into pi-dev
am:
68e5f0f242
Change-Id: I2542b4dcb94b306e3fe2e3e87051f1bd6a481561
TreeHugger Robot [Wed, 11 Apr 2018 18:36:31 +0000 (18:36 +0000)]
Merge "DO NOT MERGE - Hide IWLAN system API" into pi-dev
Sunny Goyal [Wed, 11 Apr 2018 18:29:24 +0000 (11:29 -0700)]
Fixing missing reportDrawFinish method in windowCallbacksCompat
Test: Verified on launcher that there is no ANR
Bug:
77695434
Change-Id: I1c382ea24fee15835637ed9d4055161a99ff3625
TreeHugger Robot [Wed, 11 Apr 2018 18:29:40 +0000 (18:29 +0000)]
Merge "Trim the invalid uids and tags when reading uids/tags from chain." into pi-dev
Tracy Zhou [Sun, 8 Apr 2018 06:54:46 +0000 (23:54 -0700)]
Update the recents onboarding UI to the latest mock.
Screenshot: https://screenshot.googleplex.com/ks6kWo0R2gd
Bug:
70180942
Test: manual test
Change-Id: Iabe6431db59e0539db5a1952cbb07f95ed6fa7ed
TreeHugger Robot [Wed, 11 Apr 2018 18:20:42 +0000 (18:20 +0000)]
Merge "Add filegroup for supporting apache-http stubs generation." into pi-dev-plus-aosp
Bookatz [Wed, 11 Apr 2018 18:19:33 +0000 (11:19 -0700)]
Merge "StatsManager throws exceptions" into pi-dev
am:
6b317915e8
Change-Id: I3de523046404285f3bcc7bfff598393d7c16820d
Alex Chau [Wed, 11 Apr 2018 18:13:30 +0000 (11:13 -0700)]
Merge "Dismiss keyguard when switching user if lockscreen is disabled on new user" into pi-dev
am:
87646514be
Change-Id: I083f1e5c59090340be8afbd4c5178db16ef12772
Bryce Lee [Wed, 11 Apr 2018 18:09:37 +0000 (11:09 -0700)]
Merge "Ensure ActivityStack's cached resumed activity is updated." into pi-dev
am:
6f14dc95cf
Change-Id: I1cda8ecb6e0878ffd133a35b32259171991762b2
David Pursell [Wed, 11 Apr 2018 18:05:52 +0000 (18:05 +0000)]
Merge "MessageQueue: explicitly remove FD event listeners." into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 18:03:44 +0000 (18:03 +0000)]
Merge "Mark CTS-tested APIs as @TestApi" into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 18:01:24 +0000 (18:01 +0000)]
Merge "BufferingParams: add annotation @TestApi" into pi-dev
David Brazdil [Wed, 11 Apr 2018 17:57:56 +0000 (10:57 -0700)]
Merge "Greylist methods with varargs and intrinsics" into pi-dev
am:
1eff922e34
Change-Id: I2cf0a3459b3723aa263d5ae6ca4dafe3a589181d
Chavi Weingarten [Wed, 11 Apr 2018 17:52:25 +0000 (10:52 -0700)]
Merge "Synchronize stack position and size update for split screen" into pi-dev
am:
9553a11557
Change-Id: Ie9308010a2c856284aca2fdc53304e3b79a080bb
TreeHugger Robot [Wed, 11 Apr 2018 17:52:22 +0000 (17:52 +0000)]
Merge "Fix docs and bug in SliceManager#bindSlice" into pi-dev
Anton Philippov [Wed, 11 Apr 2018 17:48:40 +0000 (10:48 -0700)]
Merge "Pass app version to agent in adb restore for kv." into pi-dev
am:
133f93bbbb
Change-Id: I8c16ca2f13a7c03fd754928422b736658a53f779
Julia Reynolds [Wed, 11 Apr 2018 17:40:24 +0000 (10:40 -0700)]
Merge "Update volume logging" into pi-dev
am:
259bdbf43d
Change-Id: I98caa2367c2aa6cf569685147cd4a71efc78ab6c
Colin Cross [Wed, 11 Apr 2018 17:28:39 +0000 (17:28 +0000)]
Merge "Revert "Update docs to match encryption requirements"" into pi-dev
Colin Cross [Wed, 11 Apr 2018 17:27:24 +0000 (17:27 +0000)]
Revert "Update docs to match encryption requirements"
This reverts commit
cebb55ea9d98dc7ba93eed520b874ac24ff96800.
Reason for revert: broke docs builds
Change-Id: I3a4b8d274141efec90fae2ed0b9324194288c635
Mathew Inwood [Wed, 11 Apr 2018 17:19:04 +0000 (10:19 -0700)]
Merge "Configurable sampling rate for hidden API access log events." into pi-dev
am:
fb55bd8706
Change-Id: I734dffcd6c993bf718d6835a734be26de5d76780
Yao Chen [Wed, 11 Apr 2018 17:10:46 +0000 (10:10 -0700)]
Merge "Handle logd reconnect." into pi-dev
am:
2e0f45f087
Change-Id: I15cdb063331da9b1e6479d598314fb1cf05ab9f1
Nathan Harold [Wed, 11 Apr 2018 17:09:07 +0000 (17:09 +0000)]
Merge "[DO NOT MERGE] - Hide Tunnel Mode IpSec API" into pi-dev
Adrian Roos [Wed, 11 Apr 2018 17:06:56 +0000 (10:06 -0700)]
Merge "DisplayCutout: Draw anti-aliased bounds in soft overlay" into pi-dev
am:
2370f368d4
Change-Id: Ifae0d5e2c5bc226eaaf4462dd9b9cb044c8340b8
TreeHugger Robot [Wed, 11 Apr 2018 17:02:06 +0000 (17:02 +0000)]
Merge "StatsManager throws exceptions" into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 17:02:00 +0000 (17:02 +0000)]
Merge "Dismiss keyguard when switching user if lockscreen is disabled on new user" into pi-dev
Phil Weaver [Wed, 11 Apr 2018 17:01:04 +0000 (10:01 -0700)]
Merge "Fix AccessibilityEvent#getContentChangeTypes doc" into pi-dev
am:
441ef0b94b
Change-Id: I41f5d4b21754b11be1ef7b0613598cd56e999ece
Bryce Lee [Wed, 11 Apr 2018 17:00:26 +0000 (17:00 +0000)]
Merge "Ensure ActivityStack's cached resumed activity is updated." into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 16:58:49 +0000 (16:58 +0000)]
Merge "Greylist methods with varargs and intrinsics" into pi-dev
Chavi Weingarten [Wed, 11 Apr 2018 16:53:42 +0000 (16:53 +0000)]
Merge "Synchronize stack position and size update for split screen" into pi-dev
Anton Philippov [Wed, 11 Apr 2018 16:53:30 +0000 (16:53 +0000)]
Merge "Pass app version to agent in adb restore for kv." into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 16:49:15 +0000 (16:49 +0000)]
Merge "Update volume logging" into pi-dev
Mike Digman [Wed, 11 Apr 2018 16:47:37 +0000 (09:47 -0700)]
Merge "Fix null running task info in SysUI tests" into pi-dev
am:
997e7b7ea4
Change-Id: I6fb0654d6fe06f23cc1bac282f5005693e523bf7
Mathew Inwood [Wed, 11 Apr 2018 16:45:19 +0000 (16:45 +0000)]
Merge "Configurable sampling rate for hidden API access log events." into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 16:45:11 +0000 (16:45 +0000)]
Merge "Handle logd reconnect." into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 16:44:32 +0000 (16:44 +0000)]
Merge "DisplayCutout: Draw anti-aliased bounds in soft overlay" into pi-dev
Jeff Sharkey [Wed, 11 Apr 2018 16:05:44 +0000 (10:05 -0600)]
Lint to identify "deprecated at birth" APIs.
When API council requests changes, teams regularly perform the
requested refactoring, but simply mark the old APIs as @Deprecated
without @removed, due to internal users.
As part of finalizing an SDK, we should ensure that no new APIs are
marked @Deprecated, since they're typically cleanup that someone
forgot to finish. This extension to the lint script makes it easy
to identify these cases.
$ python tools/apilint/apilint.py --show-deprecations-at-birth \
api/current.txt ../../prebuilts/sdk/api/28.txt
$ python tools/apilint/apilint.py --show-deprecations-at-birth \
api/system-current.txt ../../prebuilts/sdk/system-api/28.txt
Bug:
77588754
Test: manual inspection
Change-Id: Ie9658006bb08f780bee0e503481d3bafec1038a1
Patrick Baumann [Wed, 11 Apr 2018 16:41:34 +0000 (09:41 -0700)]
Merge "Revert "Check permissions only against packagesettings"" into pi-dev
am:
61aebf6d39
Change-Id: Idfe77e93a7dd1f3e87e58c1f323c080ed615a57a
Rohan Shah [Tue, 10 Apr 2018 04:34:50 +0000 (00:34 -0400)]
[QS] Update mobile tile secondary text
Since the mobile data string is required for the content description,
adding a new string for the short version and updating the footer impl
and icon setup logic to reference the content description instead.
Test: Manually, via string check in QS
Bug:
77693344
Change-Id: I794500bcd445f98d69c096f6bf2f3b7d147c2780
Phil Weaver [Wed, 11 Apr 2018 16:38:28 +0000 (16:38 +0000)]
Merge "Fix AccessibilityEvent#getContentChangeTypes doc" into pi-dev
Siyamed Sinir [Wed, 11 Apr 2018 16:31:45 +0000 (09:31 -0700)]
Merge "Change fonts.xml to add 34 new fonts in OTF." into pi-dev
am:
239d9d86d9
Change-Id: I3fd36707aa0eb6011caf647f7ea03043e5f53961
Philip P. Moltmann [Wed, 11 Apr 2018 16:23:19 +0000 (09:23 -0700)]
Properly disconnect after skipping an operation.
If we skip an operation we used to just return. This lead to the service
staying connected, holding the wakelock and consuming power.
Hence after we skip an operation we need to check if we can disconnect
the service, basically treating skipping an operation similar failing
to execute the operation.
Fixes:
77766977
Test: Detected music via sound trigger service and triggered dropping of
operations
Change-Id: Ia837d628193b3a5c2763f4aae666193d624b6d7f
Julia Reynolds [Wed, 11 Apr 2018 15:33:32 +0000 (11:33 -0400)]
Show onboarding screen from dnd tile
Increase the DND version and reset the setting so those who
are upgrading P->P see the new flow.
Test: manual
Change-Id: I9286f022d1fa6520305ff03dbce54c4eec0e371a
Fixes:
77658931
Bo Zhu [Wed, 11 Apr 2018 16:21:14 +0000 (09:21 -0700)]
Merge "Add an API to check whether the recoverable keystore is enabled" into pi-dev
am:
4d1b57dad3
Change-Id: I07106b9b06f290d6d464a8d5bfbf82d90e95e000
Mike Digman [Wed, 11 Apr 2018 16:12:47 +0000 (16:12 +0000)]
Merge "Fix null running task info in SysUI tests" into pi-dev
Adrian Roos [Tue, 10 Apr 2018 22:17:08 +0000 (15:17 -0700)]
DisplayCutout: Draw anti-aliased bounds in soft overlay
To do so, we cannot use the Region from DisplayCutout, because it is conceptionally
a binary Bitmap. Instead, we need the exact curve as a Path.
Also fixes a theoretical bug where the DisplayCutout
was cached even though the display height changed.
Change-Id: I9356f4589186fedc5dc95010c7bd1a1fa20edf5e
Fixes:
77868940
Test: Enable display cutout in developer options, verify the edges look smoth and not jagged.
Test: atest DisplayCutoutTest
Chad Brubaker [Wed, 11 Apr 2018 16:12:27 +0000 (09:12 -0700)]
Merge "Allow shared users to rotate signing certs in an OTA" into pi-dev
am:
c826eec11f
Change-Id: I0bbb0a9ab3c60fdf71b69dbda2ef02508fa07eb4
TreeHugger Robot [Wed, 11 Apr 2018 16:05:39 +0000 (16:05 +0000)]
Merge "Revert "Check permissions only against packagesettings"" into pi-dev
Siyamed Sinir [Wed, 11 Apr 2018 16:04:52 +0000 (16:04 +0000)]
Merge "Change fonts.xml to add 34 new fonts in OTF." into pi-dev
jiabin [Wed, 11 Apr 2018 16:00:10 +0000 (09:00 -0700)]
Merge "Fix mic enumeration CTS fail on marlin." into pi-dev
am:
0b5dd8e560
Change-Id: I681eb47ec1577ad6c2b35d0e739c249bf61f0f26
Bo Zhu [Wed, 11 Apr 2018 15:58:27 +0000 (15:58 +0000)]
Merge "Add an API to check whether the recoverable keystore is enabled" into pi-dev
Chad Brubaker [Wed, 11 Apr 2018 15:57:21 +0000 (15:57 +0000)]
Merge "Allow shared users to rotate signing certs in an OTA" into pi-dev
TreeHugger Robot [Wed, 11 Apr 2018 15:46:49 +0000 (15:46 +0000)]
Merge "Fix mic enumeration CTS fail on marlin." into pi-dev
Dan Gittik [Wed, 11 Apr 2018 15:11:14 +0000 (08:11 -0700)]
Merge "Added gamma correction tests." into pi-dev
am:
02fea072ab
Change-Id: I84f4e961128888cf9a3b01b3584221dd60609a10
Tim Volodine [Wed, 11 Apr 2018 14:56:25 +0000 (07:56 -0700)]
Merge "[WebView Tracing API] documentation fixes." into pi-dev
am:
4800d9a9e7
Change-Id: I226ef118f27661a94502e990ba89ad662f63f583
Patrick Baumann [Wed, 11 Apr 2018 14:51:30 +0000 (14:51 +0000)]
Revert "Check permissions only against packagesettings"
This reverts commit
b00eb6459127018ec7641f407d5873a0c417416d.
Reason for revert: Boot issues after OTA
Bug:
76228188
Fixes:
77888575
Change-Id: I5ca2605cb6befea46ce50198bc72bdd4b6e84f1a
TreeHugger Robot [Wed, 11 Apr 2018 14:48:17 +0000 (14:48 +0000)]
Merge "Added gamma correction tests." into pi-dev
Alex Chau [Wed, 11 Apr 2018 14:41:32 +0000 (15:41 +0100)]
Dismiss keyguard when switching user if lockscreen is disabled on new user
Test: Manual
Bug:
77535056
Change-Id: I55d590644b0187c624bca8aef5c21656315ecd87
David Brazdil [Sat, 7 Apr 2018 19:00:35 +0000 (20:00 +0100)]
Greylist methods with varargs and intrinsics
This is due to a related Doclava change.
Bug:
64382372
Test: make
Change-Id: I8fba27a529a83751ab27859b1c1b791ab85786cf
TreeHugger Robot [Wed, 11 Apr 2018 14:38:02 +0000 (14:38 +0000)]
Merge "[WebView Tracing API] documentation fixes." into pi-dev
Bryce Lee [Wed, 11 Apr 2018 14:34:43 +0000 (07:34 -0700)]
Merge "Move container focusability logic to ActivityStackSupervisor." into pi-dev
am:
90d388aebd
Change-Id: I12bd4346131b03d3032e5cd357b332b792132282
Bryce Lee [Wed, 11 Apr 2018 14:23:39 +0000 (14:23 +0000)]
Merge "Move container focusability logic to ActivityStackSupervisor." into pi-dev
Florian Mayer [Wed, 11 Apr 2018 14:15:16 +0000 (07:15 -0700)]
Merge "Address API comments on NetworkStats#getDefaultNetwork." into pi-dev
am:
f1657a827f
Change-Id: Ic7356df8144ca41a89bfbf194155bc41058a200d
Robert Berry [Wed, 11 Apr 2018 14:10:28 +0000 (07:10 -0700)]
Merge "Update docs to match encryption requirements" into pi-dev
am:
bfa13fe76f
Change-Id: I81f6a613bc8ef123ce33f53bfc6a44092d72a7a9
Jason Monk [Tue, 10 Apr 2018 19:00:18 +0000 (15:00 -0400)]
Fix docs and bug in SliceManager#bindSlice
Test: cts
Change-Id: I812af1eda072c2af0b29454a05ea777d8f4c3c62
Fixes:
73123733
Amin Shaikh [Wed, 11 Apr 2018 14:00:26 +0000 (07:00 -0700)]
Merge "Fix spacing between signal and text on qs footer." into pi-dev
am:
782ee5a7e0
Change-Id: Icabd558931b28dad1353f7e38756f2afc8451893
Anton Philippov [Wed, 11 Apr 2018 13:41:58 +0000 (14:41 +0100)]
Pass app version to agent in adb restore for kv.
This is a temporary solution for P to unblock GTS tests.
Bug:
77852250
Test: manual:
1. adb backup -f saved-wifi-api100.ab -keyvalue com.android.providers.settings
2. adb restore saved-wifi-api100.ab
3. See that SettingsBackupAgent receives appVersionCode in onRestore()
Change-Id: I6092bea570e7e27cb5b72165e9284ad2befc21b6
Florian Mayer [Wed, 11 Apr 2018 13:55:51 +0000 (13:55 +0000)]
Merge "Address API comments on NetworkStats#getDefaultNetwork." into pi-dev
OSDN Git Service
