OSDN Git Service
Andy Hung [Fri, 6 Apr 2018 18:19:48 +0000 (18:19 +0000)]
Merge "Add TestApi annotation to AudioEffect, AudioFormat, VolumeShaper" into pi-dev
TreeHugger Robot [Fri, 6 Apr 2018 18:17:11 +0000 (18:17 +0000)]
Merge "Update battery strings to respect user 24 hour setting" into pi-dev
TreeHugger Robot [Fri, 6 Apr 2018 18:16:36 +0000 (18:16 +0000)]
Merge "WifiConfiguration: Modify time display in toString" into pi-dev
Fyodor Kupolov [Fri, 6 Apr 2018 17:57:10 +0000 (17:57 +0000)]
Merge "Added dontSendToRestrictedApps broadcast option" into pi-dev
David Brazdil [Fri, 6 Apr 2018 17:42:05 +0000 (17:42 +0000)]
Merge changes Idca52b94,I82ae308d into pi-dev
* changes:
Sort hidden API light grey
Add more hidden API to light grey
Lei Yu [Fri, 6 Apr 2018 17:19:19 +0000 (17:19 +0000)]
Merge "Hide app if it shares uid with whitelisted app" into pi-dev
TreeHugger Robot [Fri, 6 Apr 2018 17:17:39 +0000 (17:17 +0000)]
Merge "Move the alarm status icon to the first position." into pi-dev
TreeHugger Robot [Fri, 6 Apr 2018 17:12:01 +0000 (17:12 +0000)]
Merge "Switch to Saturated color mode when Accessibility transforms are active" into pi-dev
TreeHugger Robot [Fri, 6 Apr 2018 17:06:44 +0000 (17:06 +0000)]
Merge "media: Populate Image scaling mode in reader and writer" into pi-dev
Winson Chung [Fri, 6 Apr 2018 16:45:02 +0000 (16:45 +0000)]
Merge "Generalize the recents animation to work with non-home activity." into pi-dev
Selim Cinek [Fri, 6 Apr 2018 15:59:34 +0000 (15:59 +0000)]
Merge "Migrated the Person class to its own file" into pi-dev
TreeHugger Robot [Fri, 6 Apr 2018 15:48:43 +0000 (15:48 +0000)]
Merge "Added gamma correction to autobrightness." into pi-dev
Pankaj Kanwar [Fri, 6 Apr 2018 15:40:39 +0000 (15:40 +0000)]
Merge "Update Javadoc to clarify which calls are logged." into pi-dev
TreeHugger Robot [Fri, 6 Apr 2018 15:31:24 +0000 (15:31 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Jorim Jaggi [Fri, 6 Apr 2018 15:31:21 +0000 (15:31 +0000)]
Merge "Inherit packageName/windowAnimations on TaskSnapshotSurface" into pi-dev
TreeHugger Robot [Fri, 6 Apr 2018 15:31:20 +0000 (15:31 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Lucas Dupin [Fri, 6 Apr 2018 15:21:07 +0000 (15:21 +0000)]
Merge "Trigger new frame after display is ready to turn on" into pi-dev
TreeHugger Robot [Fri, 6 Apr 2018 15:18:46 +0000 (15:18 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Fri, 6 Apr 2018 15:18:42 +0000 (15:18 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Fri, 6 Apr 2018 15:18:25 +0000 (15:18 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
David Brazdil [Fri, 6 Apr 2018 15:12:39 +0000 (15:12 +0000)]
Merge "Add more API on hiddenapi-light-greylist.txt" into pi-dev
David Brazdil [Fri, 6 Apr 2018 15:11:09 +0000 (16:11 +0100)]
Sort hidden API light grey
Previous changes kept the file unsorted
Bug:
64382372
Test: make
Change-Id: Idca52b9476cda1eabb8dc2a90d6e8182e1a58b32
David Brazdil [Fri, 6 Apr 2018 15:10:44 +0000 (16:10 +0100)]
Add more hidden API to light grey
Bug:
77487572
Test: make
Change-Id: I82ae308d26542e7e72e174e9531f2de80e182e26
TreeHugger Robot [Fri, 6 Apr 2018 14:55:00 +0000 (14:55 +0000)]
Merge "Add deprecation notice to Linkify MAP_ADDRESSES" into pi-dev
Amin Shaikh [Fri, 6 Apr 2018 14:50:23 +0000 (10:50 -0400)]
Move the alarm status icon to the first position.
Change-Id: I0330af8ae721421454c9e02216344d4841868d63
Bug:
74985733
Fixes:
77689775
Test: visual
Jorim Jaggi [Fri, 6 Apr 2018 14:46:20 +0000 (14:46 +0000)]
Merge "Wait for unknown vis to resolve before forcing keyguard orientation" into pi-dev
TreeHugger Robot [Fri, 6 Apr 2018 14:38:16 +0000 (14:38 +0000)]
Merge "Add Polish keycharactermap" into pi-dev
TreeHugger Robot [Fri, 6 Apr 2018 14:27:18 +0000 (14:27 +0000)]
Merge "Fix typo in comments." into pi-dev
Jorim Jaggi [Fri, 6 Apr 2018 14:02:07 +0000 (16:02 +0200)]
Inherit packageName/windowAnimations on TaskSnapshotSurface
Such that when the starting window gets picked for the animation,
we can resolve the animation as well.
Test: Long press home, "Home settings", press home, repeat
Test: go/wm-smoke
Change-Id: I81cd022ccd13a720f7ba7a037cb686126cb36722
Fixes:
77688444
Nicolas Geoffray [Fri, 6 Apr 2018 13:57:25 +0000 (13:57 +0000)]
Merge "Light grey MethodHandles$Lookup;-><init>" into pi-dev
Bill Yi [Fri, 6 Apr 2018 13:47:23 +0000 (06:47 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I4ce56eab007e4d30a0e74f1d5951b819c4f7e36d
TreeHugger Robot [Fri, 6 Apr 2018 13:45:32 +0000 (13:45 +0000)]
Merge "Treat hidden API exemptions as whitelist." into pi-dev
TreeHugger Robot [Fri, 6 Apr 2018 13:37:06 +0000 (13:37 +0000)]
Merge "Listen for bluetooth audio changes in system ui." into pi-dev
TreeHugger Robot [Fri, 6 Apr 2018 13:30:33 +0000 (13:30 +0000)]
Merge changes from topic "gpuprio" into pi-dev
* changes:
Add ThreadedRendererCompat for Launcher use
Add ability to change context priority of RT GL context
Jorim Jaggi [Fri, 6 Apr 2018 13:11:47 +0000 (15:11 +0200)]
Wait for unknown vis to resolve before forcing keyguard orientation
If TRANSIT_UNOCCLUDE is set it may only be so because we are
starting another activity that occludes the Keyguard.
UnknownVisibilityController knows about this, so ask it and wait
with forcing Keyguard orientation if needed.
Test: Take image from secure camera in landscape, press on the
photo, ensure no rotations
Test: Dismiss alarm in landscape, observe no rotations
Fixes:
68819499
Change-Id: If143ce43f620d77d62f5812950a040e531cc0a02
Jorim Jaggi [Fri, 6 Apr 2018 13:07:20 +0000 (13:07 +0000)]
Merge "Update anim to spec" into pi-dev
Mathew Inwood [Fri, 6 Apr 2018 12:53:45 +0000 (13:53 +0100)]
Fix typo in comments.
Keep the nitpickers happy.
Test: m
Bug:
77517571
Change-Id: I70374c05df3e366b5a0ce3bbb103dce28f48d4b8
Rubin Xu [Fri, 6 Apr 2018 12:54:24 +0000 (12:54 +0000)]
Merge "Tweak SystemUpdatePolicy APIs" into pi-dev
TreeHugger Robot [Fri, 6 Apr 2018 12:45:23 +0000 (12:45 +0000)]
Merge "Add new hidden APIs to light grey" into pi-dev
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
Nicolas Geoffray [Fri, 6 Apr 2018 12:22:40 +0000 (13:22 +0100)]
Light grey MethodHandles$Lookup;-><init>
bug:
77520086
Test: m
Change-Id: I539d7222af01c0163ab14946248465f1105f578d
Jorim Jaggi [Thu, 5 Apr 2018 12:36:53 +0000 (14:36 +0200)]
Add ThreadedRendererCompat for Launcher use
Bug:
75985430
Change-Id: Ia9a7c68cdff8a3263aa75f1178cb90bf4cf6f3de
Jorim Jaggi [Wed, 4 Apr 2018 21:07:35 +0000 (23:07 +0200)]
Add ability to change context priority of RT GL context
Test: Use method, observe GPU preemption behavior
Bug:
75985430
Change-Id: Idc08d37f8c95f52c5aab7edf09c0cbff72b8482d
Bill Yi [Fri, 6 Apr 2018 12:04:06 +0000 (05:04 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I01e238c2e50777eb025e8ba17f9e7a5fa056adc9
Emilian Peev [Fri, 6 Apr 2018 11:55:00 +0000 (12:55 +0100)]
media: Populate Image scaling mode in reader and writer
"ImageReader" and "ImageWriter" must pass information about the
specific buffer scaling mode.
Bug:
76022384
Test: Manual using application,
Camera CTS
Change-Id: I116f00cbf3b1487d8e44661e8fd15e2aa16e6e0d
Bill Yi [Fri, 6 Apr 2018 11:57:22 +0000 (04:57 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I630d9ca9ab17fb374c2f550466139e5ac00a2685
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
Mathew Inwood [Thu, 5 Apr 2018 12:56:39 +0000 (13:56 +0100)]
Treat hidden API exemptions as whitelist.
Update docs accordingly.
Test: m
Bug:
64382372
Change-Id: Ief8daf3badeb046b0461a3ebcd289e242d559070
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
Bill Yi [Fri, 6 Apr 2018 10:09:30 +0000 (03:09 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I34ed36fb830a86346ebe45632272d5570fb0064d
David Brazdil [Fri, 6 Apr 2018 09:54:05 +0000 (10:54 +0100)]
Add more API on hiddenapi-light-greylist.txt
Bug:
64382372
Bug:
77266422
Test: make
Change-Id: If6c753e58d613c8f0c76367bc93eb4c3f500650c
Bill Yi [Fri, 6 Apr 2018 09:49:55 +0000 (02:49 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I43f7c0fa22dc570954994a6153ce2648ffcf191f
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
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 06:48:25 +0000 (06:48 +0000)]
Merge "Move the logic of (re)evaluation of Private DNS" into pi-dev
Lucas Dupin [Fri, 6 Apr 2018 05:20:44 +0000 (22:20 -0700)]
Trigger new frame after display is ready to turn on
Making sure that a frame will be pushed after the display is ready to
turn on by invaliding the clock after a delay.
Also removed unecessary binder call.
Test: cover prox sensor and wait 1 minute. repeat ~10 times
Change-Id: Ic1b8006781e5486822a5ab65b71b3c44980f2f16
Fixes:
71913808
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:42:36 +0000 (04:42 +0000)]
Merge "WifiManager: allow setWifiApConfiguration to return false" into pi-dev
TreeHugger Robot [Fri, 6 Apr 2018 03:48:14 +0000 (03:48 +0000)]
Merge "Persistence of LPP profile" into pi-dev
Andy Hung [Fri, 6 Apr 2018 00:38:11 +0000 (17:38 -0700)]
Add TestApi annotation to AudioEffect, AudioFormat, VolumeShaper
Test: AudioEffectTest
Test: AudioRecordTest
Test: AudioTrackTest
Test: AudioTrackSurroundTest
Test: AudioTrack_ListenerTest
Test: BassBoostTest
Test: EnvReverbTest
Test: EqualizerTest
Test: LoudnessEnhancerTest
Test: PresetReverbTest
Test: VirtualizerTest
Test: VisualizerTest
Test: VolumeShaperTest
Bug:
77652246
Bug:
77651563
Bug:
77652497
Change-Id: I3a95cb6834fac0cd0cb88ea3ed0ba028aeddb3f2
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
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)
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
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
TreeHugger Robot [Fri, 6 Apr 2018 00:23:52 +0000 (00:23 +0000)]
Merge "Update IpSecManager to use InetAddress and prefixLen" into pi-dev
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
Selim Cinek [Fri, 23 Mar 2018 23:39:02 +0000 (16:39 -0700)]
Migrated the Person class to its own file
Because we are expecting usage of Person across
other surfaces, we migrate the class out
of he Notification class which is already incredibly
huge.
Test: Migrated existing cts test
Change-Id: Ia487ae7965b5ca2b016245d21faa63e3b4628344
Fixes:
75980526
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
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
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
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
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
Roshan Pius [Mon, 2 Apr 2018 20:30:28 +0000 (13:30 -0700)]
WifiConfiguration: Modify time display in toString
Use TimeUtils to format the time display fields which hold wall clock
time.
Also, use |elapsedRealTime| to calculate the time durations for the
fields which are populated using elapsedRealTime.
Bug:
77224338
Test: Unit tests
Test: 'adb shell dumpsys wifi'
Change-Id: I850ebdc3ba1f7bfb7d5137382d2feed7e551c311
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
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
Salvador Martinez [Thu, 5 Apr 2018 18:05:40 +0000 (11:05 -0700)]
Update battery strings to respect user 24 hour setting
ICU on android doesn't respect users 24 hour setting by default.
This CL makes it so that tell ICU what the users setting is so that
it will respect it.
Test: robotests updated
Bug:
77483888
Change-Id: I46eec2a10530b8b490f6a681c3a9b0a9dd4d68bd
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)
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