Commit Graph

443250 Commits

Author SHA1 Message Date
Lucas Dupin
0d1b51e5d5 Merge "Fix default wallpaper transition issue" into qt-qpr1-dev am: 8de3b785c4
am: c29e70ef63

Change-Id: Icf68f39b520ad708d3b113841c47100789d03c70
2019-09-06 11:32:34 -07:00
Blake Kragten
4a2420a2f7 Merge "Connection change and high tx power Q port Changed missed Q merge back in April" into qt-qpr1-dev am: cf1268a5f5
am: da96cb4086

Change-Id: Ibddaa8aab5157b8480adb05c0cb8306d414c26eb
2019-09-06 11:28:34 -07:00
Varun Shah
ea424deee9 Merge "Fix bootloop issue with UsageStatsService." into qt-qpr1-dev am: eff156093c
am: a5c53a01ae

Change-Id: I9e172385ca47ee1a37986f27694b904acb22769b
2019-09-06 11:25:35 -07:00
Jonathan Scott
b5e96b176b [automerger skipped] Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." into qt-dev am: b01fe73ed3 am: 68f73efcb9 am: 00386d79f5 -s ours
am: d43aa31232 -s ours
am skip reason: change_id I2bce277ff8f2de4614e19d5385fe6712b076f9c9 with SHA1 fb77e63aa5 is in history

Change-Id: I63f53d1aa6514ff3c9a9f3d0e573aa8a72c85a99
2019-09-06 11:20:13 -07:00
Erin Yan
be20b487bd [automerger skipped] Remove PASSWORD_QUALITY_MANAGED from CarTrustAgentUnlockDialogHelper am: b1af47bec8
am: 4278063467 -s ours
am skip reason: change_id I5e848ca3183f624158dc192159f57aaa9d27a89c with SHA1 7bed781be5 is in history

Change-Id: I5395e1d12964f677b31a56f07aea2ee3f12b145b
2019-09-06 11:18:17 -07:00
Heemin Seog
ba355da4ce [automerger skipped] Merge "Handle USB eject and unmount via Car Settings" into qt-qpr1-dev am: 59db7b8d01
am: c799b2dcb0 -s ours
am skip reason: change_id I90b18eb0e66abb1b22701fd390202468970d9ae6 with SHA1 91fab5cb44 is in history

Change-Id: I0276a3910223742012ecef136c609abc3fa0e8b5
2019-09-06 11:14:41 -07:00
TreeHugger Robot
2257e8b62d Merge "int userHandle -> int userId" 2019-09-06 18:08:08 +00:00
Lucas Dupin
c29e70ef63 Merge "Fix default wallpaper transition issue" into qt-qpr1-dev
am: 8de3b785c4

Change-Id: I730392200e589e97192e1612ce7517ba2d6c93e1
2019-09-06 11:07:36 -07:00
Erin Yan
b7eca93a5f [automerger skipped] Merge "Create dialog to show detecting Batmobile device & unlocking" into qt-qpr1-dev am: cf885ef399
am: 80d3b193eb -s ours
am skip reason: change_id I47b55e3032c814623aa5bf5c5c3ec1899c03e98e with SHA1 16258e3e98 is in history

Change-Id: I08a27ba1e8061002d7d823fa2b83a9946947a3e9
2019-09-06 11:04:22 -07:00
Blake Kragten
da96cb4086 Merge "Connection change and high tx power Q port Changed missed Q merge back in April" into qt-qpr1-dev
am: cf1268a5f5

Change-Id: I294286840c969fba42ff2814423ae4dbd81a8577
2019-09-06 11:03:30 -07:00
Colin Cross
fe163c6f7d Merge changes from topic "protobuf-3.9.1"
* changes:
  Convert statsd_test and statsd_benchmark to proto lite
  Adapt to google::protobuf::uint64 type change
2019-09-06 18:01:08 +00:00
Varun Shah
a5c53a01ae Merge "Fix bootloop issue with UsageStatsService." into qt-qpr1-dev
am: eff156093c

Change-Id: Iece7adc8dd9a3cb5c704e917b22337cf8339f460
2019-09-06 10:59:13 -07:00
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
Jonathan Scott
d43aa31232 [automerger skipped] Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." into qt-dev am: b01fe73ed3 am: 68f73efcb9
am: 00386d79f5 -s ours
am skip reason: change_id I2bce277ff8f2de4614e19d5385fe6712b076f9c9 with SHA1 a5e4422d14 is in history

Change-Id: I3a0dbdfc2de586cbb7dbeb0d0d9fd34535323b42
2019-09-06 10:53:38 -07:00
Erin Yan
4278063467 Remove PASSWORD_QUALITY_MANAGED from CarTrustAgentUnlockDialogHelper
am: b1af47bec8

Change-Id: Ib569c5cf238e196deec26f65662e437b7db05510
2019-09-06 10:50:34 -07:00
Heemin Seog
c799b2dcb0 Merge "Handle USB eject and unmount via Car Settings" into qt-qpr1-dev
am: 59db7b8d01

Change-Id: Ia01b9fe95c175f242b771fa1cb1b33bceecda896
2019-09-06 10:49:43 -07:00
Erin Yan
80d3b193eb Merge "Create dialog to show detecting Batmobile device & unlocking" into qt-qpr1-dev
am: cf885ef399

Change-Id: Ib7d8a17d32690414b34e646df631c78c167593eb
2019-09-06 10:48:27 -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
Lucas Dupin
8de3b785c4 Merge "Fix default wallpaper transition issue" into qt-qpr1-dev 2019-09-06 17:16:23 +00:00
Blake Kragten
cf1268a5f5 Merge "Connection change and high tx power Q port Changed missed Q merge back in April" into qt-qpr1-dev 2019-09-06 17:03:30 +00:00
Bookatz
f56f258495 int userHandle -> int userId
Throughout the codebase, sometimes an integer user ID is called
userId, and sometimes it is called userHandle. Here, we rename the
occurences of "int userHandle" to "int userId" in select files.
Additionally, we add the @UserIdInt annotation in many more places.

This certainly does not cover all uses of userHandle, which is used
widely throughout Android; doing so would be more dangerous and cause
merge conflicts. But at least the core User code can have a consistent
nomenclature.

Bug: 138384792
Test: compiles. presubmit passes.

Change-Id: I9a2684e9bfac637e0476c4b68027008ebb8a160b
2019-09-06 09:26:35 -07:00
Jimmy Chen
aa62e30c8d Merge "ocsp: add OCSP field in WifiEnterpriseConfig" 2019-09-06 16:15:04 +00:00
TreeHugger Robot
eff156093c Merge "Fix bootloop issue with UsageStatsService." into qt-qpr1-dev 2019-09-06 16:00:48 +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
00386d79f5 Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." into qt-dev am: b01fe73ed3
am: 68f73efcb9

Change-Id: Ied2f83b88c7e2f596fb03597fce7bebbd4fa615c
2019-09-06 04:57:05 -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
68f73efcb9 Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." into qt-dev
am: b01fe73ed3

Change-Id: Idd7424cf00a3c5d8d41e3e051d78d0ac4d6c4a19
2019-09-06 04:44:06 -07:00
Jonathan Scott
b01fe73ed3 Merge "Add MANAGED_PROVISIONING_DPC_DOWNLOADED." into qt-dev 2019-09-06 11:20:56 +00:00
Ahan Wu
c6e84a1340 Fix default wallpaper transition issue
The dimension of default wallpaper is only 1243x1024, this causes the
transition looks not smooth.

Bug: 139297053
Test: Manually kill current wallpaper serveral times.
Test: After fallback wallpaper appears, look the transition.
Change-Id: Ie3eb1a61753cf30210414139c9af492b60c7334b
2019-09-06 19:19:05 +08: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