Commit Graph

443218 Commits

Author SHA1 Message Date
Pinyao Ting
f747a43df2 [automerger skipped] fixes a security vulnerability in slice provider am: 46368e4f5c -s ours am: d16ceb6e8e -s ours am: 122636b4f5 -s ours am: a86312e067 -s ours
am: 4351f32689 -s ours
am skip reason: change_id Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965 with SHA1 a6364d92ed is in history

Change-Id: I72bf10271ed38bbf518a647d783e3520bb9f235c
2019-09-06 10:55:22 -07:00
Pinyao Ting
4351f32689 [automerger skipped] fixes a security vulnerability in slice provider am: 46368e4f5c -s ours am: d16ceb6e8e -s ours am: 122636b4f5 -s ours
am: a86312e067 -s ours
am skip reason: change_id Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965 with SHA1 a6364d92ed is in history

Change-Id: Id35626673047fae9dc53de1633685eb2fc1c3994
2019-09-06 10:43:17 -07:00
Jimmy Chen
aa62e30c8d Merge "ocsp: add OCSP field in WifiEnterpriseConfig" 2019-09-06 16:15:04 +00:00
Al Sutton
8d098c28c6 Merge "Move backup encryption to separate APK" 2019-09-06 14:57:27 +00:00
Fabian Kozynski
ab2c31a31f Merge "Adding a Plugin to attach things under QQS" 2019-09-06 13:05:32 +00:00
Fabian Kozynski
c28bc18621 Merge "Prototype to use details or settings panels" 2019-09-06 13:00:10 +00:00
Mohammad Samiul Islam
9cb206f225 Merge "Merge get-stagedsessions with pm list and improve on it" 2019-09-06 12:48:31 +00:00
Jonathan Scott
10ed94a04f [automerger skipped] Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." into qt-dev am: b01fe73ed3 am: 719cd95a84 am: 7f08445f65
am: 7483dfdecf -s ours
am skip reason: change_id I2bce277ff8f2de4614e19d5385fe6712b076f9c9 with SHA1 fb77e63aa5 is in history

Change-Id: Iabe3bc5deff8ddf93f6e5a4f66f9bd8cb592a60f
2019-09-06 05:23:16 -07:00
Jonathan Scott
7483dfdecf Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." into qt-dev am: b01fe73ed3 am: 719cd95a84
am: 7f08445f65

Change-Id: Ia225249bd3f61b8d7bb0f3ea756d654cf6b7578f
2019-09-06 05:09:10 -07:00
Jonathan Scott
7f08445f65 Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." into qt-dev am: b01fe73ed3
am: 719cd95a84

Change-Id: I27898e265c24dbb7c4668cb47dbcb23ebdbf2b95
2019-09-06 04:57:04 -07:00
Jonathan Scott
719cd95a84 Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." into qt-dev
am: b01fe73ed3

Change-Id: I800c640883b1ef9eff5fff0200a0785ccd2d18ae
2019-09-06 04:44:09 -07:00
Jonathan Scott
b01fe73ed3 Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." into qt-dev 2019-09-06 11:20:56 +00:00
Gavin Corkery
a06a874ba2 Merge "Block until userdata backup/restore has taken place" 2019-09-06 11:16:00 +00:00
Chun-Wei Wang
48f07880c0 Merge changes from topic "bug140472424_remove_PackageWatchdog_getPackages"
* changes:
  Remove unused code (6/n)
  Rewrite testObserveAlreadyObservedPackage (5/n)
  Rewrite PackageWatchdogTest#testPersistence (4/n)
  Rewrite PackageWatchdogTest#testRegistration (3/n)
  Collect packages when TestObserver#onHealthCheckFailed is called (2/n)
  Add a helper to reduce boilerplate code (1/n)
2019-09-06 11:13:43 +00:00
Jiyong Park
fd273baef9 [automerger skipped] Revert "Fix: vendor public libraries are accessible via System.loadLibrary" am: 9c7d8b12b4 am: c93d704df2 am: 2ce280c5d5
am: dc61203d30 -s ours
am skip reason: change_id I1970eba7e732728699042a36b89571915ec81451 with SHA1 37131e1ee6 is in history

Change-Id: I9784df70d2b83efac1d34ba343295d203d1eef24
2019-09-06 04:08:02 -07:00
JW Wang
dbc7520d19 Remove unused code (6/n)
Bug: 140472424
Test: atest PackageWatchdogTest
Change-Id: I9c42b20785c3002a4d73423a0cac26e3d45640eb
2019-09-06 19:05:27 +08:00
JW Wang
d23419c15c Rewrite testObserveAlreadyObservedPackage (5/n)
Bug: 140472424
Test: atest PackageWatchdogTest
Change-Id: Iec9da1b3495cf3f933ecb47879a2ff82ad76fe75
2019-09-06 19:05:12 +08:00
JW Wang
43e265f065 Rewrite PackageWatchdogTest#testPersistence (4/n)
Bug: 140472424
Test: atest PackageWatchdogTest
Change-Id: I094a7a4d5ebcff673345403156b35c69f5407bca
2019-09-06 19:05:00 +08:00
JW Wang
dcd029cda3 Rewrite PackageWatchdogTest#testRegistration (3/n)
Following go/unit-test-practices, we split testRegistration into smaller
ones so each test focuses on one behavior at a time.

Note we will remove testRegistration in a later CL.

Bug: 140472424
Test: atest PackageWatchdogTest
Change-Id: I88e00a8fc43b953d575ee047979b7fe1d5fbd3ba
2019-09-06 19:04:49 +08:00
JW Wang
a5dc6d54b6 Collect packages when TestObserver#onHealthCheckFailed is called (2/n)
TestObserver#mHealthCheckFailedPackages is added to collect packages
when TestObserver#onHealthCheckFailed is called. It will be used to test
if resgistration/unregistration is done successfully.

TestController#mFailedPackages is also renamed to be distinguished from
mHealthCheckFailedPackages.

Bug: 140472424
Test: atest PackageWatchdogTest
Change-Id: I791e0a1b8e5d59ae766502b54a0782d509b209b5
2019-09-06 19:04:40 +08:00
JW Wang
b4b37500d6 Add a helper to reduce boilerplate code (1/n)
Bug: 140472424
Test: atest PackageWatchdogTest
Change-Id: I3aa80f1c7706702620da0ce2247afe0359cb0674
2019-09-06 19:04:05 +08:00
Jiyong Park
dc61203d30 Revert "Fix: vendor public libraries are accessible via System.loadLibrary" am: 9c7d8b12b4 am: c93d704df2
am: 2ce280c5d5

Change-Id: Id5d78f11daa7229e8c589c82366112dd4d117c53
2019-09-06 03:54:37 -07:00
Jiyong Park
2ce280c5d5 Revert "Fix: vendor public libraries are accessible via System.loadLibrary" am: 9c7d8b12b4
am: c93d704df2

Change-Id: Iee36c8f242d6fc7b29af0b3cc1811af3e4890e98
2019-09-06 03:41:10 -07:00
Jiyong Park
c93d704df2 Revert "Fix: vendor public libraries are accessible via System.loadLibrary"
am: 9c7d8b12b4

Change-Id: I37e549a8a39bdfd478808c415384d90537cbbe62
2019-09-06 03:27:16 -07:00
Mohammad Samiul Islam
f50641a957 Merge get-stagedsessions with pm list and improve on it
Bug: 140290940
Test: adb shell pm list staged-sessions ---only-ready
      --only-sessionid --only-parent
Change-Id: I9b866569815f182edfc9743ee1a66224b7f36b41
2019-09-06 10:42:51 +01:00
Al Sutton
ad52c6bc3a Move backup encryption to separate APK
Test: atest -c --rebuild-module-info BackupEncryptionRoboTests
Change-Id: I5a8ac3a9c010bd3c516464dee333cef406c5dcfa
2019-09-06 10:22:33 +01:00
Jiyong Park
9c7d8b12b4 Revert "Fix: vendor public libraries are accessible via System.loadLibrary"
This reverts commit cfe38cdb1c.

The CL 8f712189dfc02285573337e2b4ab17678011db14 in libcore project avoids
the need for adding the new paths in LoadedApk. With the CL, a classloader
does not give up even when loader.findLibrary() has failed due to some
paths are not added to it. Instead, the classloader converts the given
libname into a filename (e.g. foo -> libfoo.so) then calls dlopen()
with the filename. The classloader reports failure only when the dlopen()
call has failed. Therefore, manually adding these paths to the classloader
is no longer needed and thus removed.

Bug: 109720125
Test: System.loadLibrary("adsprpc") is successful in Pixel (because
libadsprpc.so is in Pixel's vendor public lib list)
Test: atest cts/tests/tests/jni

Merged-In: I1970eba7e732728699042a36b89571915ec81451
(cherry picked from commit 37131e1ee6)
Change-Id: I1970eba7e732728699042a36b89571915ec81451
2019-09-06 14:02:26 +09:00
TreeHugger Robot
c5a1fb3d2e Merge "Reduce relayoutWindow when requestTransparentRegion" 2019-09-06 04:58:57 +00:00
Hongming Jin
f09d52d3e0 Merge "Revoke granted permission when the permission defining app is removed." 2019-09-06 04:52:10 +00:00
TreeHugger Robot
c9c241e650 Merge "Update UsageStats#checkAndGetTimeLocked behavior." 2019-09-06 03:20:50 +00:00
Kevin Chyn
90df5c81ac Merge "5/n: Restore biometric dialog state across configuration changes" 2019-09-06 02:41:10 +00:00
Jimmy Chen
7938515152 ocsp: add OCSP field in WifiEnterpriseConfig
Bug: 136720092
Test: atest FrameworksWifiApiTests
Test: tested with OCSP supported profile
Change-Id: I0095a235792997fda54a2f68af48819caf3deef1
2019-09-06 10:39:35 +08:00
TreeHugger Robot
3df41c00c1 Merge "Move NotificationEntry.channel to a getter" 2019-09-06 00:55:56 +00:00
Kevin Chyn
9cf899162e 5/n: Restore biometric dialog state across configuration changes
Bug: 123378871

Test: manual test, rotating device during various stages of
      authentication
Test: atest com.android.systemui.biometrics

Change-Id: I4130f79975f58e5141c9d69e2689680ceaa419ed
2019-09-05 17:48:40 -07:00
Hongming Jin
bc4d010e10 Revoke granted permission when the permission defining app is removed.
Bug: 67319274
Test: atest android.permission.cts.RemovePermissionTest
Change-Id: I20c4c975a1dd41a0a6c3e068988fe60be51dd1b4
2019-09-05 17:39:29 -07:00
Varun Shah
5e1613ef64 Update UsageStats#checkAndGetTimeLocked behavior.
The time change event was happening for every user even if they were not
unlocked, causing UsageStatsService to crash. Since the data is now
located in CE, the #checkAndGetTimeLocked function has been moved to
UserUsageStatsService, tying time change events to each user instead of
UsageStatsService. This gives the guarantee that no usage stats data
will be accessed or modified if the user service is not existent while
keeping the same behavior as earlier.

References to #checkAndGetTimeLocked in UsageStatsService have been
updated to call System.currentTimeMillis() directly.

Bug: 140529704
Test: atest UsageStatsTest
Test: atest UsageStatsDatabaseTest
Change-Id: I746790f3918b927ac8ac76ee860c94cac603e5da
2019-09-05 17:03:36 -07:00
Christian Wailes
e3913dd91e Merge "Don't clear the output array if it failed to open the proc status file" 2019-09-05 23:14:40 +00:00
Xin Li
e18b84bd5a [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: d191463bb0 -s ours am: 2556f35b94 -s ours am: 5cdd996e0a am: 6500b83b40
am: a6ec9f50eb -s ours
am skip reason: subject contains skip directive

Change-Id: I46d8c3eca94ff0322f0dc37d8dfa5d2986f6e9d2
2019-09-05 16:02:06 -07:00
Xin Li
44b38f6d72 [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: e199ca954d -s ours am: 03f35832bf -s ours am: 9b38ec8ccd am: 81d6024d89
am: 04504fa3bb -s ours
am skip reason: subject contains skip directive

Change-Id: Ied21f8bfc652bbb33b4bb703927a2b77ef4b54b3
2019-09-05 15:33:25 -07:00
Xin Li
a6ec9f50eb [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: d191463bb0 -s ours am: 2556f35b94 -s ours am: 5cdd996e0a
am: 6500b83b40

Change-Id: I3942d005e76f24005bd5b94ddb6a00b78547391f
2019-09-05 15:31:39 -07:00
Evan Rosky
4c67d2678e Merge changes from topic "unify_window_resize_1"
* changes:
  Unify Window resize (1/N)
  Remove TaskRecord.updateOverrideConfig
2019-09-05 22:28:52 +00:00
Lyn Han
d691d0d28e Merge "Fix dot for smart reply and bubble groups" 2019-09-05 22:24:24 +00:00
Xin Li
04504fa3bb [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: e199ca954d -s ours am: 03f35832bf -s ours am: 9b38ec8ccd
am: 81d6024d89

Change-Id: Ib3a591c7228db83f4c17c270117e8ae06134341e
2019-09-05 15:05:29 -07:00
Xin Li
6500b83b40 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: d191463bb0 -s ours am: 2556f35b94 -s ours
am: 5cdd996e0a

Change-Id: Ie7b34f06a9600d4e9ddd9587aac1ce2aec5ad12f
2019-09-05 15:04:33 -07:00
Xin Li
81d6024d89 [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: e199ca954d -s ours am: 03f35832bf -s ours
am: 9b38ec8ccd

Change-Id: Ibf2eaa45d685bba0b3472b510a13e2c78a5f2277
2019-09-05 14:44:40 -07:00
Xin Li
5cdd996e0a [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: d191463bb0 -s ours
am: 2556f35b94 -s ours
am skip reason: subject contains skip directive

Change-Id: Id766798b32e4613728ea35b502c15660b8e8fbb2
2019-09-05 14:41:36 -07:00
Paul Mclean
04d77e17b4 Merge "Restrict enumeration of USB Audio Interfaces" 2019-09-05 21:22:20 +00:00
Xin Li
2556f35b94 [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master"
am: d191463bb0 -s ours
am skip reason: subject contains skip directive

Change-Id: I47d5e62a09155529525a892c1687519f054d43f9
2019-09-05 14:18:24 -07:00
Pinyao Ting
bf7209b78a [automerger skipped] fixes a security vulnerability in slice provider am: 46368e4f5c -s ours am: d16ceb6e8e -s ours am: 96a88f3a22 -s ours am: dcf94d8b0a -s ours
am: 42b5a2a215 -s ours
am skip reason: change_id Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965 with SHA1 a6364d92ed is in history

Change-Id: I74a7fe565ac429c78a5223a6d6697224c02d3391
2019-09-05 14:08:48 -07:00
Xin Li
9b38ec8ccd [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: e199ca954d -s ours
am: 03f35832bf -s ours
am skip reason: subject contains skip directive

Change-Id: I112f6ad00252d63046d6732a5c0fa72e7ff64e9c
2019-09-05 14:06:52 -07:00