OSDN Git Service
Chong Zhang [Thu, 22 Mar 2018 17:39:52 +0000 (17:39 +0000)]
Merge "heif: fix Exif extraction in mtp database" into pi-dev
Felipe Leme [Thu, 22 Mar 2018 17:36:18 +0000 (17:36 +0000)]
Merge "Don't allow null ids on FillResponse.Builder.setAuthentication()" into pi-dev
Felipe Leme [Thu, 22 Mar 2018 17:33:36 +0000 (17:33 +0000)]
Merge "Fixed autofill service metadata name on javadoc sample." into pi-dev
Bo Zhu [Thu, 22 Mar 2018 17:32:10 +0000 (17:32 +0000)]
Merge "Remove the hard-coded counterId in VaultParams" into pi-dev
Robert Berry [Thu, 22 Mar 2018 17:23:05 +0000 (17:23 +0000)]
Merge "Unhide RecoveryController#getRootCertificates()" into pi-dev
Robert Berry [Thu, 22 Mar 2018 17:19:33 +0000 (17:19 +0000)]
Merge "Unhide RecoverySession#recoverKeyChainSnapshot() method" into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 17:07:01 +0000 (17:07 +0000)]
Merge "Make QSTileImpl#mListeners thread safe." into pi-dev
Felipe Leme [Thu, 22 Mar 2018 16:24:53 +0000 (16:24 +0000)]
Merge "Renamed AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES." into pi-dev
Fyodor Kupolov [Thu, 22 Mar 2018 16:21:24 +0000 (16:21 +0000)]
Merge "Add OWNERS for GlobalSettingsToPropertiesMapper" into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 16:14:19 +0000 (16:14 +0000)]
Merge "Audio presentation: Docs & Testability fixes" into pi-dev
Wyatt Riley [Thu, 22 Mar 2018 16:10:08 +0000 (16:10 +0000)]
Merge "GNSS Model Name constant string and comment updates" into pi-dev
Felipe Leme [Thu, 22 Mar 2018 15:39:09 +0000 (08:39 -0700)]
Fixed autofill service metadata name on javadoc sample.
Bug:
72811034
Test: nope
Change-Id: I0367fa6ad1fa21c51dadb9706830bc50c3139cab
Michael Plass [Thu, 22 Mar 2018 15:03:51 +0000 (15:03 +0000)]
Merge "Add Settings.Global.WIFI_SCORE_PARAMS" into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 14:04:20 +0000 (14:04 +0000)]
Merge "DO NOT MERGE Revert "DO NOT MERGE Update references to backup/restore agent timeouts"" into pi-dev
Robert Berry [Thu, 22 Mar 2018 13:55:31 +0000 (13:55 +0000)]
Merge "Small fix for the key grant alias used in importKey" into pi-dev
Robert Berry [Wed, 21 Mar 2018 16:31:52 +0000 (16:31 +0000)]
Unhide RecoverySession#recoverKeyChainSnapshot() method
The other methods expose raw key materials, which is a security flaw. This
new API is already being used by GMSCore, via reflection (although falling
back to the old methods if it is not available). Would be good to switch it
on ASAP.
Bug:
74345822
Test: Tested with GMSCore
Change-Id: I30d53c9e825888d1122c72d23b7c1c10c6edb1e9
Robert Berry [Wed, 21 Mar 2018 21:57:07 +0000 (21:57 +0000)]
Unhide RecoveryController#getRootCertificates()
This is so we can add a GTS test to affirm that GMS devices include the
Google Cloud Key Vault root certificate.
Test: runtest frameworks-core -p android.security.keystore.recovery
Bug:
74621045
Change-Id: Ib6431f5739f3dff066832e6aa300dd9da5bc0727
Robert Berry [Thu, 22 Mar 2018 13:48:31 +0000 (13:48 +0000)]
Merge "Unhide the new RecoverySession#start with the alias for root cert" into pi-dev
Artem Iglikov [Thu, 22 Mar 2018 12:18:07 +0000 (12:18 +0000)]
DO NOT MERGE Revert "DO NOT MERGE Update references to backup/restore agent timeouts"
This reverts commit
f77cae61250c727630616b5672df2781e84a7e80.
Reason for revert: crashes SUW
Bug:
76128378
Change-Id: Ia77af64892aa5a03109cc4ef4c2c04b256000ba9
Christofer Åkersten [Thu, 22 Mar 2018 11:49:41 +0000 (11:49 +0000)]
Merge "Remove unnecessary Context from ApiLoader" into pi-dev
Julia Reynolds [Thu, 22 Mar 2018 11:39:28 +0000 (11:39 +0000)]
Merge "Fix index error" into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 10:50:47 +0000 (10:50 +0000)]
Merge "Adds support for a fall-back model when the language-specific model is not found." into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 08:49:38 +0000 (08:49 +0000)]
Merge "Finalise STK call control strings" into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 06:16:00 +0000 (06:16 +0000)]
Merge "Letterbox: make letterbox work with drag resizing" into pi-dev
Christofer Åkersten [Thu, 22 Mar 2018 05:53:53 +0000 (14:53 +0900)]
Remove unnecessary Context from ApiLoader
Bug:
76001644
Test: compile
Change-Id: I6ac81dac16374d90facfe33c68607c5c286b335f
Bo Zhu [Thu, 22 Mar 2018 05:46:55 +0000 (22:46 -0700)]
Remove the hard-coded counterId in VaultParams
Bug:
72221676
Test: Manual test and runtest frameworks-services -p
com.android.server.locksettings.recoverablekeystore
Change-Id: I51cfac6478d59f41c1107106a14af008463f7de7
Jordan Liu [Thu, 22 Mar 2018 00:39:12 +0000 (17:39 -0700)]
Finalise STK call control strings
Bug:
64685331
Bug:
70352301
Test: manual
Change-Id: I53e9ec5e520f960b7adb3a29770e1f57065eb4c8
Merged-In: I53e9ec5e520f960b7adb3a29770e1f57065eb4c8
Andrew Sapperstein [Thu, 22 Mar 2018 05:27:35 +0000 (05:27 +0000)]
Merge "Remove java-symbol for deleted string." into pi-dev
Andreas Terzis [Thu, 22 Mar 2018 05:02:10 +0000 (05:02 +0000)]
Merge "Enable new data usage settings features." into pi-dev
Felipe Leme [Thu, 22 Mar 2018 04:50:04 +0000 (04:50 +0000)]
Merge "Set FIELD_AUTOFILL_NUM_DATASETS to -1 when service return no response." into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 03:08:38 +0000 (03:08 +0000)]
Merge "Make sure at least one non-aux IME is enabled" into pi-dev
Bo Zhu [Thu, 22 Mar 2018 02:50:50 +0000 (19:50 -0700)]
Unhide the new RecoverySession#start with the alias for root cert
Bug:
76033708
Test: none, it's just unhiding APIs
Change-Id: Iec1e44d24bb1704da082404566233ada83b8eb81
TreeHugger Robot [Thu, 22 Mar 2018 01:30:52 +0000 (01:30 +0000)]
Merge "ScheduledJobStateChanged: add stop reason" into pi-dev
Makoto Onuki [Thu, 22 Mar 2018 00:51:03 +0000 (00:51 +0000)]
Merge "Updated the javadoc of ContentResolver.addPeriodicSync to correct the minimum interval of periodic sync." into pi-dev
kopriva [Thu, 22 Mar 2018 00:39:02 +0000 (00:39 +0000)]
docs: fixing typo in reference document
am:
60b06bd217
Change-Id: Ie0a6380e8287d49b4d80f8742e51345372e5b8a9
TreeHugger Robot [Thu, 22 Mar 2018 00:29:38 +0000 (00:29 +0000)]
Merge changes I7f413e38,I20aba7e9 into pi-dev
* changes:
Remove FlpHardwareProvider
Create the stubs lib for com.android.location.provider
Bo Zhu [Wed, 21 Mar 2018 21:33:15 +0000 (14:33 -0700)]
Small fix for the key grant alias used in importKey
Bug:
74345822
Test: atest RecoveryControllerHostTest#testImportKey_ValidKey
Change-Id: I54812b3d7465ee508fe48886f5897470fe7455a0
Felipe Leme [Wed, 21 Mar 2018 00:12:17 +0000 (17:12 -0700)]
Renamed AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES.
The syntax of that setting changed from P Developer Preview1 to the final P, so
it's safer to use a new name than risk breaking devices during the update.
Bug:
74458004
Test: atest CtsAutoFillServiceTestCases:VirtualContainerActivityCompatModeTest\
FrameworksCoreTests:SettingsBackupTest
Change-Id: I1c507e8eae20f598dfe259178667ae6c2bc892ff
Xiangyu/Malcolm Chen [Wed, 21 Mar 2018 23:18:25 +0000 (23:18 +0000)]
Merge "Revert "By default, turn on signal strength update in power save mode."" into pi-dev
Xiangyu/Malcolm Chen [Wed, 21 Mar 2018 22:28:32 +0000 (22:28 +0000)]
Revert "By default, turn on signal strength update in power save mode."
This reverts commit
cbd29712a934ba1d29b5c5de6a48b22c976e4b8a.
Reason for revert:
No need for a config. We don't ever want to disable signal strength update in power save mode.
Bug:
69644626
Change-Id: I0a7bf991c36076b0eceb816eed1b1bf7434c1d3d
Rohan Shah [Wed, 21 Mar 2018 23:11:32 +0000 (23:11 +0000)]
Merge "[QS] Update long-press tooltip text" into pi-dev
Fyodor Kupolov [Wed, 21 Mar 2018 23:02:58 +0000 (23:02 +0000)]
Merge "Added BinderCallsStatsService" into pi-dev
Andrew Sapperstein [Wed, 21 Mar 2018 22:46:50 +0000 (15:46 -0700)]
Remove java-symbol for deleted string.
Change-Id: Id686cc07aef4641327854dda20bace7b46cffe99
Fixes:
76110242
Bug:
72941316
Test: builds
TreeHugger Robot [Wed, 21 Mar 2018 22:38:41 +0000 (22:38 +0000)]
Merge "Unregister lux sensor when not in adaptive mode." into pi-dev
Makoto Onuki [Wed, 21 Mar 2018 22:32:33 +0000 (22:32 +0000)]
Merge "Implement new BS warning / notification flow (1/2)" into pi-dev
Jan Nordqvist [Wed, 21 Mar 2018 22:09:04 +0000 (15:09 -0700)]
Enable new data usage settings features.
Bug:
70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I0d2942bf8b8e13ebefd7df899a6ecfc6595d1780
Maggie Wang [Wed, 21 Mar 2018 22:02:03 +0000 (22:02 +0000)]
Merge "Fix location settings bug on non-GPS devices" into pi-dev
TreeHugger Robot [Wed, 21 Mar 2018 21:34:10 +0000 (21:34 +0000)]
Merge "Fix wrong SafeUnref type" into pi-dev
Liefu Liu [Wed, 21 Mar 2018 17:25:49 +0000 (10:25 -0700)]
Updated the javadoc of ContentResolver.addPeriodicSync to correct the minimum interval of periodic sync.
Bug:
76033438
Change-Id: I1ccb7ae174f8f13dae24296a3fb7e9dfcd77c7fa
Fixes:
76033438
Test: javadoc only. presubmit only.
TreeHugger Robot [Wed, 21 Mar 2018 21:24:19 +0000 (21:24 +0000)]
Merge "Remove am/wm.proto which is redundant. The naming convention is defined in core/proto/README.md" into pi-dev
Felipe Leme [Wed, 21 Mar 2018 19:56:05 +0000 (12:56 -0700)]
Don't allow null ids on FillResponse.Builder.setAuthentication()
It would crash the system when save is invoked.
The issue was reproduced by passing a null id on
AuthenticationTest#testFillResponseAuthServiceHasNoDataButCanSave , but that
change was not committed because with the fix the builder would throw an
exception.
Test: atest CtsAutoFillServiceTestCases:FillResponseTest
Fixes:
76097200
Change-Id: Ifa8105ee1451ba7107082a94a538a8f84f50df18
TreeHugger Robot [Wed, 21 Mar 2018 21:11:39 +0000 (21:11 +0000)]
Merge "By default, turn on signal strength update in power save mode." into pi-dev
Nathan Harold [Wed, 21 Mar 2018 20:59:02 +0000 (20:59 +0000)]
Merge changes I4c26aea7,I79911434 into pi-dev
* changes:
Check mOwnedByTransform to avoid DELSA on SPI
Expose add/removeAddress for IpSecInterfaces
Brad Ebinger [Wed, 21 Mar 2018 20:38:00 +0000 (20:38 +0000)]
Merge "Define phone process as a constant" into pi-dev
TreeHugger Robot [Wed, 21 Mar 2018 20:09:10 +0000 (20:09 +0000)]
Merge "Enable sanitizer on statsd eng build." into pi-dev
TreeHugger Robot [Wed, 21 Mar 2018 20:07:41 +0000 (20:07 +0000)]
Merge "add car volume dialog" into pi-dev
Julia Reynolds [Wed, 21 Mar 2018 19:40:53 +0000 (15:40 -0400)]
Fix index error
Change-Id: I93cf18b35060a09a3b8f4be8e0b9b4682d390b25
Fixes:
76101440
Test: runtest systemui-notification
TreeHugger Robot [Wed, 21 Mar 2018 19:50:40 +0000 (19:50 +0000)]
Merge "Screenshot: extend scrim under cutout" into pi-dev
TreeHugger Robot [Wed, 21 Mar 2018 19:45:59 +0000 (19:45 +0000)]
Merge "Suppress all background-state services in user-forced app standby" into pi-dev
TreeHugger Robot [Wed, 21 Mar 2018 19:34:52 +0000 (19:34 +0000)]
Merge "Return a boolean from the mandatory backup transport setter." into pi-dev
Jovana Knezevic [Wed, 21 Mar 2018 19:34:32 +0000 (19:34 +0000)]
Merge "Adding UserManagerHelper class to SettingsLib." into pi-dev
Makoto Onuki [Tue, 20 Mar 2018 17:40:37 +0000 (10:40 -0700)]
Implement new BS warning / notification flow (1/2)
- Show the battery saver confirmation dialog only for the first time.
- Start counting # of manual activations, which will be used in a
follow-up CL.
Bug:
74120126
Test: Manual tests with ./vendor/google_experimental/users/omakoto/android-battery-tester
Test: m -j ROBOTEST_FILTER=BatterySaverUtilsTest RunSettingsLibRoboTests
Test: cd frameworks/base/packages/SystemUI/tests && \
atest src/com/android/systemui/power/PowerUITest.java src/com/android/systemui/power/PowerNotificationWarningsTest.java
Change-Id: If6a081a6222e6a87c4cd332364c89856e7648a36
Maggie [Fri, 16 Mar 2018 19:22:20 +0000 (12:22 -0700)]
Fix location settings bug on non-GPS devices
The old location_mode API hardcoded gps and network location provider when it enables/disables location, without checking whether the providers exist on device.
It causes bugs when used together with the new
LocationManager.setLocationEnabled() APIs.
This fix modified LocationManager.setLocationEnabled() API when user
tries to disable location on device. Besides turning off the providers
from LocationManager.getAllProviders(), it also turns off GPS and
network provider explicitly.
To reduce times of binding to the service and chance of race condition, we also
modified SettingsProvider.updateLocationProvidersAllowedLocked() to
accept a string param with multiple location providers to be
enabled or disalbed at the same time.
Bug:
73261572
Test: Manual on chromebook
Change-Id: I2e59e0d4cf395b98cd481af5d7f3c762274d7826
TreeHugger Robot [Wed, 21 Mar 2018 19:12:14 +0000 (19:12 +0000)]
Merge "Document Job Scheduler internal "calling" vs "source" package" into pi-dev
Bryce Lee [Wed, 21 Mar 2018 19:01:36 +0000 (19:01 +0000)]
Merge "Ignore non-existent displays in #topRunningActivityLocked." into pi-dev
Brad Ebinger [Wed, 21 Mar 2018 18:56:00 +0000 (18:56 +0000)]
Merge "Added Locking for MmTelFeature" into pi-dev
Winson Chung [Wed, 21 Mar 2018 18:47:41 +0000 (18:47 +0000)]
Merge "Fix issue with slippery state for quickstep button case." into pi-dev
Chavi Weingarten [Wed, 21 Mar 2018 18:30:13 +0000 (18:30 +0000)]
Merge "Don't add stopping apps in relaunch based on stopped flag." into pi-dev
TreeHugger Robot [Wed, 21 Mar 2018 18:05:21 +0000 (18:05 +0000)]
Merge "Add metric ACTION_ANOMALY_TRIGGERED" into pi-dev
Lucas Dupin [Wed, 21 Mar 2018 18:04:49 +0000 (18:04 +0000)]
Merge "Renamed config_dozeAfterScreenOff" into pi-dev
Yao Chen [Wed, 21 Mar 2018 18:00:53 +0000 (11:00 -0700)]
Enable sanitizer on statsd eng build.
Bug:
74946342
Test: manual
Change-Id: I287def435d077670814db50e4d8398ecee539b74
John Reck [Wed, 21 Mar 2018 17:50:01 +0000 (10:50 -0700)]
Fix wrong SafeUnref type
Test: builds
Change-Id: I5a03551c408736722802ba0e8692c3d85e375112
Fixes:
76029886
TreeHugger Robot [Wed, 21 Mar 2018 17:45:25 +0000 (17:45 +0000)]
Merge "Update material_deep_teal_500 to #008577." into pi-dev
TreeHugger Robot [Wed, 21 Mar 2018 17:43:40 +0000 (17:43 +0000)]
Merge "Category message is sufficient for message notif" into pi-dev
Fyodor Kupolov [Wed, 21 Mar 2018 17:16:06 +0000 (10:16 -0700)]
Add OWNERS for GlobalSettingsToPropertiesMapper
Also mention that properties being added should be whitelisted in SELinux
Test: Manual
Bug:
76082713
Change-Id: I17cebca7be98377c4b76744d9e9e69ac70c1d6dd
Adrian Roos [Wed, 21 Mar 2018 17:33:27 +0000 (17:33 +0000)]
Merge "Preserve letterbox while dragResizing" into pi-dev
Adrian Roos [Wed, 21 Mar 2018 15:22:16 +0000 (16:22 +0100)]
Letterbox: make letterbox work with drag resizing
Fixes an issue where letterboxing disabled using the insetFrame for
drag resizing, leading to unsightly jank when doing so.
Also makes sure that the insetFrame is always cleared when
not in multi-window mode, because that could lead to stale
frames when leaving a non-fullscreen task left multiwindow
mode.
Change-Id: I5576fe86ce17f8cd377bc6a55b3d50d7703569a0
Fixes:
76009001
Bug:
64369819
Test: Enable double cutout, enter landscape, enter splitscreen, drag handle, verify no weird layout issues.
Test: Open ApiDemos > App > Activity > Max Aspect Ratio > 1:1, enter split screen, open other app, drag handle up a bit, drag handle all the way up. Open Api Demos activity again from recents, verify it has correct size.
Fyodor Kupolov [Wed, 21 Mar 2018 17:25:28 +0000 (17:25 +0000)]
Merge "Include additional information in the dumpsys" into pi-dev
TreeHugger Robot [Wed, 21 Mar 2018 17:14:47 +0000 (17:14 +0000)]
Merge "WebView Tracing API: remove LARGE_BUFFER, make RECORD_CONTINUOUSLY the default mode" into pi-dev
Tim Volodine [Mon, 19 Mar 2018 20:07:23 +0000 (20:07 +0000)]
WebView Tracing API: remove LARGE_BUFFER, make RECORD_CONTINUOUSLY the default mode
This patch:
- remove the RECORD_UNTIL_FULL_LARGE_BUFFER tracing option, because
this does not appear really useful in the production setting as
the buffer size limit exceeds the device memory and can grow
uncontrollably large.
- make RECORD_CONTINUOUSLY the default mode for tracing, to make
sure the least memory is used by default (typically 4x less than the
previous default RECORD_UNTIL_FULL).
- add some missing IntDef values (to make them match with the constants)
BUG:
63750258
Test: CTS
Change-Id: Ib3698273dee776ebc7a8388fc1bd8c80255e3b63
TreeHugger Robot [Wed, 21 Mar 2018 17:09:25 +0000 (17:09 +0000)]
Merge "Make autofill save UI RTL compliant" into pi-dev
TreeHugger Robot [Wed, 21 Mar 2018 17:06:40 +0000 (17:06 +0000)]
Merge "Some Slices API refinement" into pi-dev
Benedict Wong [Wed, 21 Mar 2018 17:03:52 +0000 (17:03 +0000)]
Merge "Added implementation for VTI add/remove address" into pi-dev
Benedict Wong [Wed, 21 Mar 2018 17:03:48 +0000 (17:03 +0000)]
Merge "Add support for auth-only transforms" into pi-dev
Chavi Weingarten [Wed, 21 Mar 2018 17:02:09 +0000 (17:02 +0000)]
Merge "Merge transactions to parent if layer is going to be removed." into pi-dev
Brad Ebinger [Wed, 14 Mar 2018 23:14:55 +0000 (16:14 -0700)]
Define phone process as a constant
Test: Manual
Bug:
72645729
Merged-In: I8086e4efa15d74bd61c55b72c7b14be4705fcd58
Change-Id: If07728ea2cc0128113ebe947a154f80ff45a7d9d
TreeHugger Robot [Wed, 21 Mar 2018 16:50:32 +0000 (16:50 +0000)]
Merge "DisplayCutout: Add back always resource" into pi-dev
Leon Scroggins [Wed, 21 Mar 2018 16:48:19 +0000 (16:48 +0000)]
Merge "Report native allocation size of AnimatedImageDrawable" into pi-dev
David Brazdil [Wed, 21 Mar 2018 16:28:17 +0000 (16:28 +0000)]
Merge "Add new hidden API uses to light greylist" into pi-dev
TreeHugger Robot [Wed, 21 Mar 2018 16:26:12 +0000 (16:26 +0000)]
Merge "Get rid of upperbound on wireless charging anim" into pi-dev
Salvador Martinez [Wed, 21 Mar 2018 16:23:26 +0000 (16:23 +0000)]
Merge "Update logging util to not crash on null" into pi-dev
Bryce Lee [Tue, 20 Mar 2018 20:58:53 +0000 (13:58 -0700)]
Ignore non-existent displays in #topRunningActivityLocked.
Previous changes aimed at driving display creation through
ActivityManagerService. However, there are still cases where
WindowManagerService will encounter the display first (such as add
window). A subsequent changelist enabled this out of band creation.
As a result the WindowManagerService and ActivityManagerService can
still have different lists of displays. This mismatch leads to
#topRunningActivityLocked processing null ActivityDisplays.
This changelist skips over displays not yet encountered by
ActivityManagerService in #topRunningActivityLocked. Such displays
have no stacks and therefore no activities that could be the top
running activity.
Test: atest FrameworksServicesTests:com.android.server.am.ActivityStackSupervisorTests#testTopRunningActivityLockedWithNonExistentDisplay
Fixes:
74593710
Change-Id: I316e5305f7ce233a04ecf18d605eebdf723b0920
TreeHugger Robot [Wed, 21 Mar 2018 16:07:32 +0000 (16:07 +0000)]
Merge "UsageEvents for slices pinning" into pi-dev
Felipe Leme [Wed, 21 Mar 2018 15:52:14 +0000 (08:52 -0700)]
Set FIELD_AUTOFILL_NUM_DATASETS to -1 when service return no response.
Test: adb shell logcat -b events | grep sysui | grep '757,907'
# while running LoginActivityTest#testAutoFillNoDatasets
Bug:
70241978
Change-Id: I611bd4fa8407b16491f1ae7b859564233fa6ba81
Mike Digman [Wed, 21 Mar 2018 16:03:00 +0000 (16:03 +0000)]
Merge "Ensure rotate disable2 flag can be set on boot" into pi-dev
Mike Digman [Wed, 21 Mar 2018 16:02:45 +0000 (16:02 +0000)]
Merge "Update IME/keyboard switcher navbar icon to GM" into pi-dev
Bryce Lee [Wed, 21 Mar 2018 15:58:08 +0000 (15:58 +0000)]
Merge "Distinguish between bringing stack to front and delivering to top." into pi-dev
Bryce Lee [Wed, 21 Mar 2018 15:57:48 +0000 (15:57 +0000)]
Merge "Add unit test for ActivityStackSupervisor#testApplySleepTokensLocked." into pi-dev
David Brazdil [Tue, 20 Mar 2018 19:48:01 +0000 (19:48 +0000)]
Add new hidden API uses to light greylist
From common apps.
Bug:
64382372
Bug:
74430927
Test: make
Change-Id: I81c38a78fcdc7c33f54cd25823b301ba29638019
TreeHugger Robot [Wed, 21 Mar 2018 15:41:34 +0000 (15:41 +0000)]
Merge "Restore state if password change fails" into pi-dev