Eugene Susla
de70c2ca54
Merge "Document condition when CDM looks at bonded devices"
2019-08-15 19:36:51 +00:00
TreeHugger Robot
cf2efde135
Merge "Use PlatformConfig to gate behavior"
2019-08-15 19:08:35 +00:00
Bernardo Rufino
bf7f342b1b
Merge changes I7f839a37,I11d8912b,Ia44b7b83,I47e80728
...
* changes:
Move adb backup/restore operations to Trampoline
Move restore operations to Trampoline
Move backup operations to Trampoline
Move settings operations to Trampoline
2019-08-15 17:49:17 +00:00
TreeHugger Robot
9dfafd6a6f
Merge "Add @UnsupportedAppUsage annotations to telephony-common."
2019-08-15 17:24:14 +00:00
TreeHugger Robot
88c50c1609
Merge changes I8bb56554,I2e88997a
...
* changes:
Dump some extra information from LockSettingsService
Clean up exception usage in LockSettingsService (part 2)
2019-08-15 16:56:55 +00:00
Anna Trostanetski
e5b41b7f9e
Merge "Move IPlatformCompat.aidl definition to framework.jar"
2019-08-15 16:50:38 +00:00
TreeHugger Robot
d918696bea
Merge "Rename RollbackData to Rollback."
2019-08-15 16:33:14 +00:00
Patrick Baumann
dfb121d705
Use PlatformConfig to gate behavior
...
This change moves away from AppOps and explicit targetSdk
checks in favor of PlatformConfig.
Test: atest AppsFilterTest
Test: adb shell device_config put package_manager_service package_query_filtering_enabled true && atest AppEnumerationTests
Fixes: 139348423
Bug: 136675067
Change-Id: If0af198c86210c05c2e10b71f7ae6dc0b7a3ea9a
2019-08-15 09:26:14 -07:00
atrost
4985d76b11
Move IPlatformCompat.aidl definition to framework.jar
...
There are non-app process usecases in framework code that need to have
access to this API.
Created a new package android.compat in frameworks/base/core following
previous definition of android.compat.Compatibility for app processes
(http://cs/android/libcore/luni/src/main/java/android/compat/Compatibility.java ).
Bug: 137769727
Test: m
Change-Id: Ifc1b97ad40c2baf65a86169e101acfa72e3aae5f
Merged-In: Ifc1b97ad40c2baf65a86169e101acfa72e3aae5f
2019-08-15 17:04:03 +01:00
Alex Light
74e8d3be48
Merge "Add agent startup-attach"
2019-08-15 16:00:53 +00:00
TreeHugger Robot
099615b943
Merge "Change Style because v14.Material is deprecated"
2019-08-15 15:21:44 +00:00
Artur Satayev
7c3d157392
Add @UnsupportedAppUsage annotations to telephony-common.
...
See go/UnsupportedAppUsage for more details.
This is needed to not lose greylist information, by moving telephony-common from bootclasspath in ag/9025572.
Bug: 137350495
Bug: 139336111
Test: m
Change-Id: Id6c1f5e403a0e66edb1102ee45f3bf19f244fb09
2019-08-15 14:59:06 +00:00
Julia Reynolds
e53e4eca99
Merge "Fix crash in ExtServices"
2019-08-15 14:23:06 +00:00
Bernardo Rufino
f410de02e2
Move adb backup/restore operations to Trampoline
...
From BMS.
Test: atest BackupManagerServiceTest TrampolineRoboTest TrampolineTest
Bug: 135661048
Change-Id: I7f839a37780c5164878fd9640486c209f99620cc
2019-08-15 14:41:48 +01:00
Rubin Xu
e2f925f280
Dump some extra information from LockSettingsService
...
To help diagnose device unlock problems. Things included:
1. Last password change time and previous SP handle
2. Current password type
3. Separate work challenge state
4. File metadata about the wrapped SP blob
Bug: 62410009
Test: adb shell dumpsys lock_settings
Change-Id: I8bb56554c9b26b4bc1dcd92df677b5190159fca7
2019-08-15 14:12:19 +01:00
Rubin Xu
0f9c2ffc72
Clean up exception usage in LockSettingsService (part 2)
...
Replace RuntimeException which cannot propagate across binder
to binder-compatible IllegalStateException/IllegalArgumentException
Bug: 128831839
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/locksettings
Change-Id: I2e88997acb27a7b97eafa7a7de441ac641544ddd
2019-08-15 14:08:38 +01:00
TreeHugger Robot
1b90222214
Merge "Clean up exception usage in LockSettingsService (part 1)"
2019-08-15 11:02:19 +00:00
TreeHugger Robot
fb67fb4f13
Merge "replace hidden Context APIs"
2019-08-15 10:56:38 +00:00
Bernardo Rufino
a83c2e0865
Move restore operations to Trampoline
...
From BMS.
Test: atest BackupManagerServiceTest TrampolineRoboTest TrampolineTest
Bug: 135661048
Change-Id: I11d8912bca23eb9391e01016fab59346b0a6ac8c
2019-08-15 11:43:51 +01:00
Bernardo Rufino
b6bc6e2f4a
Move backup operations to Trampoline
...
From BMS.
Test: atest BackupManagerServiceTest TrampolineRoboTest TrampolineTest
Bug: 135661048
Change-Id: Ia44b7b839c2f871535e18d648be49277b46e3b11
2019-08-15 11:43:47 +01:00
Raff Tsai
bdb199cbc5
Change Style because v14.Material is deprecated
...
Fixes: 110048976
Test: rebuild
Change-Id: I0c1f10c0d102fa614fffe721646a949f7006878b
2019-08-15 18:23:27 +08:00
Richard Uhler
8d512eeb95
Rename RollbackData to Rollback.
...
Because "Data" doesn't add anything useful to the name.
Also prefer the variable name "rollback" over "data" and "rd" for
instances of Rollback.
Test: builds.
Change-Id: I5ae3866753d6badcdf019525b40522937568dee5
2019-08-15 11:07:38 +01:00
TreeHugger Robot
ae26d1ebf9
Merge "Create dialog to show detecting Batmobile device & unlocking"
2019-08-15 09:56:48 +00:00
Bernardo Rufino
7dedc861b6
Move settings operations to Trampoline
...
From BMS.
Test: atest BackupManagerServiceTest TrampolineRoboTest TrampolineTest
Bug: 135661048
Change-Id: I47e8072898555fd881ffa7b3d546e858fad01c6d
2019-08-15 10:25:45 +01:00
Mohammad Samiul Islam
d8e20a8063
Merge "Add v3 signature matching support during apex validation"
2019-08-15 09:22:42 +00:00
Felipe Leme
22535065e3
Fixed SystemServiceRegistry to return a null AppPredictionManager when the service is not defined. am: 87c5855e17
...
am: fcee9fb574
Change-Id: Id9f3e74770cf1c59d5b76c79a7849211562da8a2
2019-08-15 02:19:29 -07:00
Oli Lan
860666d431
Merge "Remove INSTALLED_USERS extra from ACTION_PACKAGE_ENABLE_ROLLBACK."
2019-08-15 09:11:22 +00:00
Felipe Leme
fcee9fb574
Fixed SystemServiceRegistry to return a null AppPredictionManager when the service is not defined.
...
am: 87c5855e17
Change-Id: I207ddf77599d9a12609c7b297a58c8ce1b6eab17
2019-08-15 02:09:58 -07:00
TreeHugger Robot
4430cbd5c6
Merge "Don't log incomplete sms apps"
2019-08-15 09:08:18 +00:00
Xin Li
36aa82d9c2
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am: 5937562bfb -s ours am: c45017650c -s ours am: 7d019880fe am: 1acaa834af
...
am: 7c39b1a823 -s ours
am skip reason: subject contains skip directive
Change-Id: I073c757db73c0d456c67054012e4913c3cfe2a3b
2019-08-15 01:12:48 -07:00
Xin Li
7c39b1a823
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am: 5937562bfb -s ours am: c45017650c -s ours am: 7d019880fe
...
am: 1acaa834af
Change-Id: I3059db9a1a1a77902cd582ccbcc2d4e48d9b27b0
2019-08-15 00:58:46 -07:00
Xin Li
4dfab7587d
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master am: 1702a9da19 -s ours am: 387550abfd -s ours am: 0d140daea7 am: e1ad27bc33
...
am: 0e4b5f0504 -s ours
am skip reason: subject contains skip directive
Change-Id: I7eb5c256ba4308217f51c72f2acdcbb8ebb1690a
2019-08-15 00:53:24 -07:00
Xin Li
1acaa834af
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am: 5937562bfb -s ours am: c45017650c -s ours
...
am: 7d019880fe
Change-Id: Iba5b150adbc6788c24e83d5009d284519a3a8530
2019-08-15 00:39:29 -07:00
TreeHugger Robot
426b942eb1
Merge "Fixed SystemServiceRegistry to return a null AppPredictionManager when the service is not defined."
2019-08-15 07:36:07 +00:00
TreeHugger Robot
29569b5114
Merge "Revert "Revert "Don't start intelligence services that are not provided by the OEM."""
2019-08-15 07:36:07 +00:00
Xin Li
0e4b5f0504
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master am: 1702a9da19 -s ours am: 387550abfd -s ours am: 0d140daea7
...
am: e1ad27bc33
Change-Id: I6357f1b3ffbc7f8c72952ad9f82cec25f70d1e47
2019-08-15 00:34:40 -07:00
Xin Li
7d019880fe
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master" am: 5937562bfb -s ours
...
am: c45017650c -s ours
am skip reason: subject contains skip directive
Change-Id: Icd996e35bd851ac5fbadd7a0ce064af800c740ca
2019-08-15 00:20:44 -07:00
Xin Li
e1ad27bc33
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master am: 1702a9da19 -s ours am: 387550abfd -s ours
...
am: 0d140daea7
Change-Id: I984885195183da3ffff9c2273e6cde84a76b30f4
2019-08-15 00:15:41 -07:00
Xin Li
c45017650c
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
...
am: 5937562bfb -s ours
am skip reason: subject contains skip directive
Change-Id: I55e101aeb99bcf3e8158c1297f9a3ed5867202a6
2019-08-15 00:06:36 -07:00
Xin Li
0d140daea7
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master am: 1702a9da19 -s ours
...
am: 387550abfd -s ours
am skip reason: subject contains skip directive
Change-Id: Ia74421a52fa2611b4a70d8b1c445fa1c105867be
2019-08-14 23:51:39 -07:00
Xin Li
387550abfd
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master
...
am: 1702a9da19 -s ours
am skip reason: subject contains skip directive
Change-Id: I5d41a28d611092856d9228707097049ff91b395d
2019-08-14 23:31:36 -07:00
Treehugger Robot
5937562bfb
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master"
2019-08-15 06:13:48 +00:00
Felipe Leme
87c5855e17
Fixed SystemServiceRegistry to return a null AppPredictionManager when the service is not defined.
...
Test: manual verification
Test: atest CtsAssistTestCases
Fixes: 139416391
Change-Id: Ieb2ae3f39bd42dc077ed3db1c6acdf429a39d519
2019-08-15 06:03:24 +00:00
TreeHugger Robot
6917252289
Merge "Extract DeviceIdleInternal"
2019-08-15 05:14:26 +00:00
Android Build Merger (Role)
fba8f56888
Merge "[automerger skipped] Merge "Merge "Fix interfaceVersion in DhcpServerCallbacks" into qt-r1-dev am: 9a0d576b4d am: bdf173ad92" into qt-qpr1-dev-plus-aosp am: 071316761a -s ours am skip reason: change_id I782f479de2d7d4c6579f206645a580c905009d85 with SHA1 c6c1c69378 is in history"
2019-08-15 04:21:30 +00:00
Remi NGUYEN VAN
d267d09e44
[automerger skipped] Merge "Merge "Fix interfaceVersion in DhcpServerCallbacks" into qt-r1-dev am: 9a0d576b4d am: bdf173ad92" into qt-qpr1-dev-plus-aosp
...
am: 071316761a -s ours
am skip reason: change_id I782f479de2d7d4c6579f206645a580c905009d85 with SHA1 c6c1c69378 is in history
Change-Id: I169297e1cc1404a9cf09165b5e9ecf6b7b6a36c3
2019-08-14 21:21:08 -07:00
TreeHugger Robot
4c987b1ba3
Merge "Disable modernize-use-trailing-return-type clang-tidy check"
2019-08-15 04:21:04 +00:00
Yi Kong
fc8e666d67
Disable modernize-use-trailing-return-type clang-tidy check
...
Upcoming clang update introduced the new modernize-use-trailing-return-type
check which is not useful. Disable this warning for now (even before the
new clang update lands) since clang-tidy doesn't complain about flags it
doesn't know.
Test: build with new clang-tidy
Bug: 131328001
Change-Id: I7fbc10fb9044904f85f9a1ec6cf712ce3cec0a79
Exempt-From-Owner-Approval: Trivial, no functionality change
2019-08-15 04:20:52 +00:00
Remi NGUYEN VAN
293a7172d5
[automerger skipped] Merge "Fix interfaceVersion in DhcpServerCallbacks" into qt-r1-dev am: 9a0d576b4d am: 854115f612
...
am: 66eaa9ea38 -s ours
am skip reason: change_id I782f479de2d7d4c6579f206645a580c905009d85 with SHA1 c6c1c69378 is in history
Change-Id: I8311229c599a2532c1504568a5c5828c79cdc8cb
2019-08-14 21:17:59 -07:00
Jack Yu
a84e83ee33
Merge "Merge "Added debug messages and watchdog" into qt-r1-dev am: 24397e7a07 am: f14bf1ee93" into qt-qpr1-dev-plus-aosp
...
am: 0e53bb906d
Change-Id: I0e68fd613a18e34ab306ef501c465cb8d07a3a4b
2019-08-14 21:12:08 -07:00