OSDN Git Service
Jorim Jaggi [Fri, 6 Apr 2018 13:18:31 +0000 (06:18 -0700)]
Merge "Update anim to spec" into pi-dev
am:
c5fdecaa3b
Change-Id: I2abcc452c7e38df0fd368a864e7e5c9f77925c41
Rubin Xu [Fri, 6 Apr 2018 13:07:54 +0000 (06:07 -0700)]
Merge "Tweak SystemUpdatePolicy APIs" into pi-dev
am:
892ebd0285
Change-Id: I8cd170af9b8b15fbd1010aad50e337e95fbfb97d
Jorim Jaggi [Fri, 6 Apr 2018 13:07:20 +0000 (13:07 +0000)]
Merge "Update anim to spec" into pi-dev
David Brazdil [Fri, 6 Apr 2018 12:59:05 +0000 (05:59 -0700)]
Merge "Add new hidden APIs to light grey" into pi-dev
am:
977837acd6
Change-Id: I1593b52270e801b90c477d9ef74cf0989fb43498
Rubin Xu [Fri, 6 Apr 2018 12:54:24 +0000 (12:54 +0000)]
Merge "Tweak SystemUpdatePolicy APIs" into pi-dev
Gustav Sennton [Fri, 6 Apr 2018 12:49:40 +0000 (05:49 -0700)]
Merge "Remove WebView.getLooper()." into pi-dev
am:
fffec6ea9d
Change-Id: I1a6c334c7aa3012f576493268aa9b2fbdcf55e0a
TreeHugger Robot [Fri, 6 Apr 2018 12:45:23 +0000 (12:45 +0000)]
Merge "Add new hidden APIs to light grey" into pi-dev
Mathew Inwood [Fri, 6 Apr 2018 12:44:30 +0000 (05:44 -0700)]
Merge "Replace ALL_LISTS policy with JUST_WARN." into pi-dev
am:
1f8757d35f
Change-Id: I409285082fb4ccea01ee405b731eab607e7e0a08
Robert Berry [Fri, 6 Apr 2018 12:38:03 +0000 (05:38 -0700)]
Merge "Revert "Remove deprecated RecoveryController API."" into pi-dev
am:
4147a83ae5
Change-Id: I0ed448e79e15853a862cb79550abec6974abe9de
TreeHugger Robot [Fri, 6 Apr 2018 12:37:19 +0000 (12:37 +0000)]
Merge "Remove WebView.getLooper()." into pi-dev
Mathew Inwood [Fri, 6 Apr 2018 12:32:42 +0000 (12:32 +0000)]
Merge "Replace ALL_LISTS policy with JUST_WARN." into pi-dev
TreeHugger Robot [Fri, 6 Apr 2018 12:28:09 +0000 (12:28 +0000)]
Merge "Revert "Remove deprecated RecoveryController API."" into pi-dev
David Brazdil [Fri, 6 Apr 2018 11:41:23 +0000 (12:41 +0100)]
Add new hidden APIs to light grey
Bug:
77598425
Test: make
Change-Id: I0f7b992b62afd0590b95281bcb240899074a5fce
Jorim Jaggi [Thu, 5 Apr 2018 14:45:41 +0000 (16:45 +0200)]
Update anim to spec
Test: Close translucent activity
Change-Id: I6854fa02f6ffafdcffe3804090cfc88c7d84edc9
Fixes:
72396815
David Brazdil [Fri, 6 Apr 2018 10:59:00 +0000 (03:59 -0700)]
Merge "Add more API to hiddenapi-vendor-list.txt" into pi-dev
am:
ddeaefb546
Change-Id: I5bc47968d63c5673138186fd92f1eae6cabcfa9e
Nicolas Geoffray [Fri, 6 Apr 2018 10:54:20 +0000 (03:54 -0700)]
Merge "Add new APIS to light grey." into pi-dev
am:
ec20c88b3d
Change-Id: Iaee9c50260740fe1aad155bd171af64eb4648a14
David Brazdil [Fri, 6 Apr 2018 10:41:15 +0000 (10:41 +0000)]
Merge "Add more API to hiddenapi-vendor-list.txt" into pi-dev
TreeHugger Robot [Fri, 6 Apr 2018 10:39:52 +0000 (10:39 +0000)]
Merge "Add new APIS to light grey." into pi-dev
Robert Berry [Fri, 6 Apr 2018 10:13:16 +0000 (10:13 +0000)]
Revert "Remove deprecated RecoveryController API."
This reverts commit
0d55aa387a4ec65899fc82a1391e5533c85c3edb.
Reason for revert: aps_sidecar binary is still using some of these @removed APIs. Although HEAD of auth_folsom is fixed, aps_sidecar burned in framework is old.
Bug:
77629807
Change-Id: I2f03c7d12de30cc2eebd91bb65646caaa00fcd1d
Nicolas Geoffray [Fri, 6 Apr 2018 10:00:58 +0000 (03:00 -0700)]
Merge "Revert "Whitelist com.android.perftests.core in am instrument."" into pi-dev
am:
08f1f1f26d
Change-Id: I93ac1e0253ac2f80e829ebd8b04438733e1edae3
Nicolas Geoffray [Fri, 6 Apr 2018 09:56:39 +0000 (02:56 -0700)]
Merge "Exempt two performance tests from hidden API checks." into pi-dev
am:
7def7be47e
Change-Id: I4f43083bf8cb79035074dff33bc09e6d182efbff
Nicolas Geoffray [Fri, 6 Apr 2018 09:44:49 +0000 (09:44 +0000)]
Merge "Revert "Whitelist com.android.perftests.core in am instrument."" into pi-dev
Nicolas Geoffray [Fri, 6 Apr 2018 09:44:07 +0000 (09:44 +0000)]
Merge "Exempt two performance tests from hidden API checks." into pi-dev
David Brazdil [Fri, 6 Apr 2018 09:08:56 +0000 (10:08 +0100)]
Add more API to hiddenapi-vendor-list.txt
Bug:
64382372
Bug:
77278525
Test: make
Change-Id: Ibfeb2c6238e6e992a88a3c056b74c02c85887fad
Nicolas Geoffray [Fri, 6 Apr 2018 09:32:37 +0000 (10:32 +0100)]
Add new APIS to light grey.
bug:
77498122
Test: m
Change-Id: I1562f1f12a966a66c066036ef3b46264af50f054
Stephen [Fri, 6 Apr 2018 08:32:07 +0000 (01:32 -0700)]
Merge "Adding more APIs to greylist Test: None" into pi-dev
am:
54b8750b06
Change-Id: I5dfeb23223d24ca659906adee84e5be893053056
TreeHugger Robot [Fri, 6 Apr 2018 08:23:07 +0000 (08:23 +0000)]
Merge "Adding more APIs to greylist Test: None" into pi-dev
Stephen [Wed, 4 Apr 2018 15:30:02 +0000 (08:30 -0700)]
Adding more APIs to greylist
Test: None
bug:
74066078
Change-Id: I029754dba43f83d6aff941c02ba1caa7fdd1e18c
Nicolas Geoffray [Fri, 6 Apr 2018 08:20:33 +0000 (09:20 +0100)]
Exempt two performance tests from hidden API checks.
Bug:
64382372
Bug:
74963051
Bug:
76162083
Test: m
Change-Id: I50f2c8993cfb8fc7b78dc8c87b2cd8d9ee92d98e
Erik Kline [Fri, 6 Apr 2018 07:03:43 +0000 (00:03 -0700)]
[automerger skipped] Merge "Move the logic of (re)evaluation of Private DNS" into pi-dev
am:
8d8a35a90e -s ours
Change-Id: I9a83aad484e84039fafb570cf5c63630144204d5
Erik Kline [Fri, 6 Apr 2018 06:48:25 +0000 (06:48 +0000)]
Merge "Move the logic of (re)evaluation of Private DNS" into pi-dev
Chong Zhang [Fri, 6 Apr 2018 05:28:58 +0000 (22:28 -0700)]
Merge "Extract exif data from mp4 extractor if available" into pi-dev
am:
0c42369361
Change-Id: I13e1140d0f70d0046dcd02175cc8940f6fb15ef2
TreeHugger Robot [Fri, 6 Apr 2018 05:13:33 +0000 (05:13 +0000)]
Merge "Extract exif data from mp4 extractor if available" into pi-dev
Rebecca Silberstein [Fri, 6 Apr 2018 04:54:38 +0000 (21:54 -0700)]
Merge "WifiManager: allow setWifiApConfiguration to return false" into pi-dev
am:
9c2c8f5df6
Change-Id: I949668cd3d326afd68f94c85e1cf02e3a219a572
Rebecca Silberstein [Fri, 6 Apr 2018 04:42:36 +0000 (04:42 +0000)]
Merge "WifiManager: allow setWifiApConfiguration to return false" into pi-dev
Siddharth Ray [Fri, 6 Apr 2018 04:02:28 +0000 (21:02 -0700)]
Merge "Persistence of LPP profile" into pi-dev
am:
a6c06bdf5a
Change-Id: I6d8bbbb78924ad8f93e34721a56bfe83bdf16a04
TreeHugger Robot [Fri, 6 Apr 2018 03:48:14 +0000 (03:48 +0000)]
Merge "Persistence of LPP profile" into pi-dev
Tracy Zhou [Fri, 6 Apr 2018 03:09:21 +0000 (20:09 -0700)]
Merge "Fix "Screen is pinned" dialog not showing completely in multi-window mode." into pi-dev
am:
b35a73e7a8
Change-Id: I0c8981f374aa45bbae699a500c6ed6327cb5dae4
Yangster-mac [Fri, 6 Apr 2018 02:59:35 +0000 (19:59 -0700)]
Merge "Flush the partial bucket when startd shuts down or config updated." into pi-dev
am:
9d4c397781
Change-Id: I47587b68036a563553f1de2c9f37e1255fb6d770
TreeHugger Robot [Fri, 6 Apr 2018 02:58:22 +0000 (02:58 +0000)]
Merge "Fix "Screen is pinned" dialog not showing completely in multi-window mode." into pi-dev
TreeHugger Robot [Fri, 6 Apr 2018 02:47:22 +0000 (02:47 +0000)]
Merge "Flush the partial bucket when startd shuts down or config updated." into pi-dev
Dan Albert [Fri, 6 Apr 2018 02:40:32 +0000 (19:40 -0700)]
Merge "Remove an API that doesn't exist." am:
454b1e37eb
am:
a9725d2d6d
Change-Id: Ie7fea7d068053b4e502e2ac8448d392db9c9d54f
Dan Albert [Fri, 6 Apr 2018 02:32:06 +0000 (19:32 -0700)]
Merge "Remove an API that doesn't exist."
am:
454b1e37eb
Change-Id: I8ef8a0dabb8840faee9d601bae49794126fa40ee
Erik Kline [Wed, 21 Mar 2018 14:18:33 +0000 (07:18 -0700)]
Move the logic of (re)evaluation of Private DNS
Moves this out of ConnectivityService and into each NetworkMonitor
(where it's more self-contained).
Test: as follows
- builds, flashes, boots
- runtest frameworks-net passes
- manual testing with working and non-working hostnames behaves
somewhat (but not entirely) as expected, and not always quickly
Bug:
64133961
Bug:
72345192
Bug:
73872000
Bug:
77140445
Merged-In: I5dc90ecfe6f6f10967b7501645ad8e030cb38982
Merged-In: Ida4967d22f0781524f0f269e30e653b8ec867258
Change-Id: Ic4322af3cb49149f2d975cb31f54b2ac7927f907
(cherry picked from commit
736353a584aa89a29e737e21e29c49fad0d38a63)
Erik Kline [Fri, 6 Apr 2018 01:53:08 +0000 (18:53 -0700)]
Merge "Move the logic of (re)evaluation of Private DNS" am:
04233ef175
am:
23ed88acad
Change-Id: I5dc90ecfe6f6f10967b7501645ad8e030cb38982
Erik Kline [Fri, 6 Apr 2018 01:38:08 +0000 (18:38 -0700)]
Merge "Move the logic of (re)evaluation of Private DNS"
am:
04233ef175
Change-Id: Ic510dabd6a2d40cd6d33a21e0128d85a0126127f
Malcolm Chen [Fri, 6 Apr 2018 01:08:38 +0000 (18:08 -0700)]
Merge "Unhide constructors of DataService and NetworkService." into pi-dev
am:
271ba383b6
Change-Id: If6a55e8d996d3b4ef1595271577b005933c752db
Yangster-mac [Wed, 4 Apr 2018 07:01:43 +0000 (00:01 -0700)]
Flush the partial bucket when startd shuts down or config updated.
Test: statsd test
BUG: b/
77556036
Change-Id: Ie4a04ace55e07c4529cdff5906ba874f8815f620
Kevin Chyn [Fri, 6 Apr 2018 00:55:47 +0000 (17:55 -0700)]
Merge "FingerprintDialogView sets visibility incorrectly" into pi-dev
am:
d5a3d88167
Change-Id: I184b3b69b359b2f6806d00d1ee215bb5d969fe9c
TreeHugger Robot [Fri, 6 Apr 2018 00:52:32 +0000 (00:52 +0000)]
Merge "Unhide constructors of DataService and NetworkService." into pi-dev
Kevin Chyn [Fri, 6 Apr 2018 00:45:10 +0000 (00:45 +0000)]
Merge "FingerprintDialogView sets visibility incorrectly" into pi-dev
Tracy Zhou [Thu, 5 Apr 2018 22:38:34 +0000 (15:38 -0700)]
Fix "Screen is pinned" dialog not showing completely in multi-window
mode.
Fixes:
73513388
Test: manual test
Change-Id: Iaa3e30399b7f12de2c6071cbe35c7bdff92f64a0
Benedict Wong [Fri, 6 Apr 2018 00:34:11 +0000 (17:34 -0700)]
Merge "Update IpSecManager to use InetAddress and prefixLen" into pi-dev
am:
b172d5b437
Change-Id: I03c0745662ab8868f719dc65c9ff8502e2ff817c
Treehugger Robot [Fri, 6 Apr 2018 00:31:20 +0000 (00:31 +0000)]
Merge "Remove an API that doesn't exist."
Rohan Shah [Fri, 6 Apr 2018 00:29:50 +0000 (17:29 -0700)]
Merge "[Notif] Disable animations as screen is powering off" into pi-dev
am:
a43acdabd4
Change-Id: I246937c5788782ef979e6fa03bb018222c08481a
TreeHugger Robot [Fri, 6 Apr 2018 00:23:52 +0000 (00:23 +0000)]
Merge "Update IpSecManager to use InetAddress and prefixLen" into pi-dev
Kodlee Yin [Fri, 6 Apr 2018 00:23:49 +0000 (17:23 -0700)]
Merge "Include ServiceRecord in foreground service exception exception text." into pi-dev
am:
e8479d77a1
Change-Id: I4631a2b5f9d89e3627d935af99ce95dc5892d6a8
TreeHugger Robot [Fri, 6 Apr 2018 00:21:30 +0000 (00:21 +0000)]
Merge "[Notif] Disable animations as screen is powering off" into pi-dev
Kodlee Yin [Fri, 6 Apr 2018 00:14:55 +0000 (00:14 +0000)]
Merge "Include ServiceRecord in foreground service exception exception text." into pi-dev
Selim Cinek [Fri, 6 Apr 2018 00:12:28 +0000 (17:12 -0700)]
Merge "Ensured that the reply icon isn't showing on HUNS" into pi-dev
am:
d7c3ba204c
Change-Id: Ib660becd9ea2df4ffdc7808c75232c33200ed28d
David Chen [Fri, 6 Apr 2018 00:00:49 +0000 (17:00 -0700)]
Merge "Fix uid map to be simpler and fix partial bucket." into pi-dev
am:
203bbbf942
Change-Id: Id9073af7625257072d6383aa174e9e5f21dc6216
TreeHugger Robot [Thu, 5 Apr 2018 23:57:11 +0000 (23:57 +0000)]
Merge "Ensured that the reply icon isn't showing on HUNS" into pi-dev
Winson Chung [Thu, 5 Apr 2018 23:55:21 +0000 (16:55 -0700)]
Merge "Fix issue with quickstep recents button not unlocking before entering PIP." into pi-dev
am:
4b436a930d
Change-Id: I644c7ae25ce422b44f8abac709b1057b52ad1bf7
Treehugger Robot [Thu, 5 Apr 2018 23:52:55 +0000 (23:52 +0000)]
Merge "Move the logic of (re)evaluation of Private DNS"
Yu-Han Yang [Thu, 5 Apr 2018 23:47:36 +0000 (16:47 -0700)]
Merge "Implements GNSS satellite blacklist" into pi-dev
am:
b1bcab2210
Change-Id: I2b02d5a1c898be0745eb88f65c6518b069d412a2
David Chen [Thu, 5 Apr 2018 23:43:45 +0000 (23:43 +0000)]
Merge "Fix uid map to be simpler and fix partial bucket." into pi-dev
Ben Gruver [Thu, 5 Apr 2018 23:41:16 +0000 (16:41 -0700)]
Merge "Fix ActivityStartInterceptor tests" into pi-dev
am:
01a7dfa37b
Change-Id: I4b00189b95ea72a03170ab92001570bcfaf115c6
Kevin Chyn [Thu, 5 Apr 2018 18:33:12 +0000 (11:33 -0700)]
FingerprintDialogView sets visibility incorrectly
Fixes:
77640780
Test: manual test with FingerprintDialog apk, with varying descriptions
and subtitles
Change-Id: I981f7334355d4e2d6dde3861349ec61d70ebb4a1
TreeHugger Robot [Thu, 5 Apr 2018 23:34:35 +0000 (23:34 +0000)]
Merge "Fix issue with quickstep recents button not unlocking before entering PIP." into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 23:28:19 +0000 (23:28 +0000)]
Merge "Implements GNSS satellite blacklist" into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 23:25:56 +0000 (23:25 +0000)]
Merge "Fix ActivityStartInterceptor tests" into pi-dev
David Chen [Thu, 5 Apr 2018 02:02:50 +0000 (19:02 -0700)]
Fix uid map to be simpler and fix partial bucket.
The previous scheme captured periodic snapshots for each config with
complex logic that's unnecessary and wasted memory. We actually don't
need to store any snapshots since we just convert the current state
into a snapshot and also include the deltas (change events) since the
previous report until now.
To make the system more robust, we also include up to 100 of the
deleted apps in the uid map.
Also, fix the wiring of the partial buckets so the metric producers
form partial buckets on both app upgrade and removal, but not on
installation of a new app.
Also, we update StatsCompanionService to also include disabled apps.
Bug:
77607583
Test: Verified unit-tests pass and added new e2e tests.
Change-Id: I98e1f544d6e6571545ae1581c4cebab807596f51
Leon Scroggins III [Thu, 5 Apr 2018 23:02:59 +0000 (16:02 -0700)]
Merge "Never scale nine-patches in ImageDecoder" into pi-dev
am:
9cb6759072
Change-Id: I468c9a0c0b83713e86c49612f27c672e957572df
Lucas Dupin [Thu, 5 Apr 2018 22:57:09 +0000 (15:57 -0700)]
Merge "Update mFirstVisibleIconState correctly" into pi-dev
am:
ec3f8260de
Change-Id: Iea09d705ccad543f5c2c25962f53b05c8c8ab493
TreeHugger Robot [Thu, 5 Apr 2018 22:42:39 +0000 (22:42 +0000)]
Merge "Never scale nine-patches in ImageDecoder" into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 22:42:34 +0000 (22:42 +0000)]
Merge "Update mFirstVisibleIconState correctly" into pi-dev
Evan Laird [Thu, 5 Apr 2018 22:41:23 +0000 (15:41 -0700)]
Merge "Don't hide the mobile type id if it doesn't change" into pi-dev
am:
13f92ccc96
Change-Id: Id9943b2de8dd2b588a7261c1172fb16d3776e7c1
Evan Laird [Thu, 5 Apr 2018 22:36:29 +0000 (15:36 -0700)]
Merge "Use #fff for ethernet signal indicators" into pi-dev
am:
8317bdcacd
Change-Id: Ibb697a0bb5ce904a2db8f5928d74850829ea24fa
TreeHugger Robot [Thu, 5 Apr 2018 22:22:41 +0000 (22:22 +0000)]
Merge "Don't hide the mobile type id if it doesn't change" into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 22:21:23 +0000 (22:21 +0000)]
Merge "Use #fff for ethernet signal indicators" into pi-dev
Salvador Martinez [Thu, 5 Apr 2018 22:19:32 +0000 (15:19 -0700)]
Merge "Add metrics constant for wifi scanning dialog" into pi-dev
am:
0b17eb5f4a
Change-Id: I9c82978c6b6305c4710719bc8f3ff7480b175fc4
Erik Kline [Wed, 21 Mar 2018 14:18:33 +0000 (07:18 -0700)]
Move the logic of (re)evaluation of Private DNS
Moves this out of ConnectivityService and into each NetworkMonitor
(where it's more self-contained).
Test: as follows
- builds, flashes, boots
- runtest frameworks-net passes
- manual testing with working and non-working hostnames behaves
somewhat (but not entirely) as expected, and not always quickly
Bug:
64133961
Bug:
72345192
Bug:
73872000
Bug:
77140445
Change-Id: Ic4322af3cb49149f2d975cb31f54b2ac7927f907
TreeHugger Robot [Thu, 5 Apr 2018 22:07:30 +0000 (22:07 +0000)]
Merge "Add metrics constant for wifi scanning dialog" into pi-dev
Malcolm Chen [Tue, 3 Apr 2018 18:48:56 +0000 (11:48 -0700)]
Unhide constructors of DataService and NetworkService.
DataService and NetworkService are System level classes. We shouldn't
hide their constructors otherwise their System level sub-class
can't be instantiated properly.
Test: gts
Bug:
77531655
Change-Id: I1a58b4857dbcf939ac124e20eb0a801ad5a9b597
Dan Albert [Thu, 5 Apr 2018 22:00:00 +0000 (15:00 -0700)]
Remove an API that doesn't exist.
Apparently this was removed in Jelly Bean:
https://stackoverflow.com/q/
24312632/632035. Keeping the decl in the
NDK just confuses people: https://stackoverflow.com/q/
49646596/632035.
Test: make checkbuild
Bug: None
Change-Id: If549fcd8f4052e633646c4ce8a054a0bbcd8b2bf
Vishwath Mohan [Thu, 5 Apr 2018 21:49:14 +0000 (14:49 -0700)]
Merge "Rename BiometricDialog to BiometricPrompt." into pi-dev
am:
5ab3cf8bec
Change-Id: Id450c37765a5f657c6fe422aa98e3b7191d7b773
Pavel Maltsev [Thu, 5 Apr 2018 21:38:01 +0000 (14:38 -0700)]
Merge "Allow OEMs to restrict access to secondary display" into pi-dev
am:
7ba60d25f3
Change-Id: I3b1a73a1a719a36af26f539ea79af8724b5010f1
Ben Gruver [Wed, 7 Mar 2018 21:24:18 +0000 (13:24 -0800)]
Fix ActivityStartInterceptor tests
This adds the SET_HARMFUL_APPS_WARNINGS permission required by
interceptHarmfulAppIfNeeded, and mocks out the new PackageManager calls
used by it
Test: atest ActivityStartInterceptorTest
Bug:
77607079
Change-Id: Iea9c183078261b03be984ba4e0fad271f1548945
Merged-In: Iea9c183078261b03be984ba4e0fad271f1548945
(cherry picked from commit
eb8fd1c68220bf771167051108a4f89a0eccec40)
Suprabh Shukla [Thu, 5 Apr 2018 21:29:46 +0000 (14:29 -0700)]
Merge "Activity interceptor dialog for suspended apps" into pi-dev
am:
822ce4f3aa
Change-Id: Id54f6edcbc854d6f58eae23d877884d1390c28c8
Vishwath Mohan [Thu, 5 Apr 2018 21:23:32 +0000 (21:23 +0000)]
Merge "Rename BiometricDialog to BiometricPrompt." into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 21:17:52 +0000 (21:17 +0000)]
Merge "Allow OEMs to restrict access to secondary display" into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 21:15:19 +0000 (21:15 +0000)]
Merge "Activity interceptor dialog for suspended apps" into pi-dev
Evan Laird [Thu, 5 Apr 2018 21:13:18 +0000 (17:13 -0400)]
Use #fff for ethernet signal indicators
Tinting is controlled by the icon manager now, so intrinsic tinting of
the icon isn't needed
Test: visual when connected to ethernet;
Change-Id: I7c97ad13084e55974b65223fcfe4e027aa343d49
Fixes:
77551489
Leon Scroggins III [Thu, 5 Apr 2018 21:11:12 +0000 (14:11 -0700)]
Merge "Rename set/get-ConserveMemory" into pi-dev
am:
d2c218f78a
Change-Id: Ib503dcfca248abdc31ee879bb4bef7a7c1af7977
Marco Nelissen [Thu, 5 Apr 2018 21:05:21 +0000 (14:05 -0700)]
Merge "Add @TestApi for field needed for test" into pi-dev
am:
d8a6f0cd94
Change-Id: Ic57c03646b7b77810747eb8d067be985001d331f
Lucas Dupin [Thu, 5 Apr 2018 20:51:14 +0000 (13:51 -0700)]
Merge "Darker scrim under unlocked shade" into pi-dev
am:
c539590768
Change-Id: I71b1718c228779c3d2a9a74f1aa3534984b0a91b
Kodlee Yin [Thu, 5 Apr 2018 19:59:56 +0000 (12:59 -0700)]
Include ServiceRecord in foreground service exception exception text.
Test: manual verification of logcat using test service that doesn't conform to foreground service rules
Bug:
77647171
Change-Id: Ie35029838359d83c31ea4e3b2faa166ac8aeec47
TreeHugger Robot [Thu, 5 Apr 2018 20:44:58 +0000 (20:44 +0000)]
Merge "Rename set/get-ConserveMemory" into pi-dev
TreeHugger Robot [Thu, 5 Apr 2018 20:41:24 +0000 (20:41 +0000)]
Merge "Add @TestApi for field needed for test" into pi-dev
Wale Ogunwale [Thu, 5 Apr 2018 20:40:17 +0000 (13:40 -0700)]
Merge "Show Recents if we are bringing a task forward in split-screen-primary" into pi-dev
am:
e576def01a
Change-Id: I90ec64f617ba563780df550d747e37e1c8e7853d
OSDN Git Service
