TreeHugger Robot
17cbea0112
Merge "[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection" into qt-qpr1-dev
2019-09-12 20:49:56 +00:00
Eran Messeri
d83c190f29
CredentialStorage: Install keys using KeyChain
...
This is part of the work to unify the manual certificate
installation flow (via "Install from storage" in the Settings
app) with the programmatic one (using
DevicePolicyManager.installKeyPair).
The change to CredentialStorage is the crux of this work, where
the key is no longer installed by calling Keystore directly.
Instead, a new AsyncTask, InstallKeyInKeyChain, was created, which
calls KeyChainService.installKeyPair with the key data and associated
certificates (as well as the UID of the designated service, to allow
installation into the WiFi Keystore).
Once that task completes, if the key was installed successfully,
then it is marked as user-selectable.
Test: Manual CtsVerifier tests: KeyChain Storage Test, CA Cert Notification Test
Test: cts-tradefed run commandAndExit cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.MixedDeviceOwnerTest#testKeyManagement
Bug: 138375478
Change-Id: I7c4b4ea725a34307f58d27252c2958771001636f
2019-09-12 15:54:30 +01:00
TreeHugger Robot
af1cd790bf
Merge "Merge similar BaseSearchIndexProvider code together"
2019-09-12 11:22:40 +00:00
TreeHugger Robot
5479ffdbaa
Merge "Replace png file with vector drawable"
2019-09-12 10:05:01 +00:00
paulhu
52d24750a4
[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED
...
Settings is using CONNECTIVITY_INTERNAL to restrict launching
tether provisoning activity by provioning apps only. However,
CONNECTIVITY_INTERNAL will be deprecated from Android R, replace
the permission to TETHER_PRIVILEGED.
Bug: 32963470
Test: atest TetherServiceTest
Change-Id: I4c8312b92de8d5d9c9090c572e54622dc4fcf9d4
2019-09-12 17:21:43 +08:00
Arc Wang
ce024a0dc5
[automerger skipped] Merge "[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network" into qt-qpr1-dev am: ec3055b9eb
...
am: 40f22313dc9db4bf7dbb
2019-09-12 01:21:54 -07:00
Arc Wang
40f22313dc
Merge "[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network" into qt-qpr1-dev
...
am: ec3055b9eb
2019-09-12 01:14:57 -07:00
TreeHugger Robot
ec3055b9eb
Merge "[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network" into qt-qpr1-dev
2019-09-12 08:05:21 +00:00
Raff Tsai
002a488354
Replace png file with vector drawable
...
Bug: 139336138
Test: visual
Change-Id: I2c97accbb7a4e693f50d23ee340cbc5c09101747
2019-09-12 15:24:43 +08:00
Bill Yi
481b51e7f3
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 8173de150d -s ours am: 9b956eb47f -s ours
...
am: a5c810d4a2
2019-09-11 23:04:52 -07:00
Bill Yi
9f72af23d1
[automerger skipped] Import translations. DO NOT MERGE am: 8173de150d -s ours am: e6107df474 -s ours
...
am: c46430c80e
2019-09-11 23:04:21 -07:00
Bill Yi
fc9b310060
[automerger skipped] Import translations. DO NOT MERGE am: deee385ba8 -s ours
...
am: 525b411585
2019-09-11 23:03:33 -07:00
Android Build Merger (Role)
a5c810d4a2
Merge "[automerger skipped] Import translations. DO NOT MERGE am: 8173de150d -s ours am: 9b956eb47f -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
2019-09-12 05:57:41 +00:00
Bill Yi
938427d5f5
[automerger skipped] Import translations. DO NOT MERGE am: 8173de150d -s ours
...
am: 9b956eb47f
2019-09-11 22:57:29 -07:00
Bill Yi
c46430c80e
[automerger skipped] Import translations. DO NOT MERGE am: 8173de150d -s ours
...
am: e6107df474
2019-09-11 22:57:28 -07:00
Bill Yi
525b411585
[automerger skipped] Import translations. DO NOT MERGE
...
am: deee385ba8
2019-09-11 22:54:54 -07:00
Bill Yi
e6107df474
[automerger skipped] Import translations. DO NOT MERGE
...
am: 8173de150d
2019-09-11 22:50:29 -07:00
Bill Yi
9b956eb47f
[automerger skipped] Import translations. DO NOT MERGE
...
am: 8173de150d
2019-09-11 22:50:27 -07:00
Raff Tsai
1f30b1cd67
Merge similar BaseSearchIndexProvider code together
...
Bug: 135053028
Test: robolectric, check search_index.db contains the same items
Change-Id: If3c18a170b0e671690df1fdf26e59a421d2c48cd
2019-09-12 11:09:09 +08:00
Bill Yi
deee385ba8
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I1b2826dd790519a2946d8505aec03f72b1815f04
2019-09-11 19:26:07 -07:00
Bill Yi
8173de150d
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I60bd87b13925d699bc7db9f6f215321ff20eea44
2019-09-11 19:10:50 -07:00
Mady Mellor
e84a8863d5
[automerger skipped] Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev-plus-aosp
...
am: 88de4328fd0c47113a5b
2019-09-11 17:17:30 -07:00
Mady Mellor
8eb388c906
[automerger skipped] qt-r1-bubbles-dev @ build 5835883
...
am: ea79e343f00c47113a5b
2019-09-11 16:58:43 -07:00
Xin Li
c123fe5be8
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: aac7f8e2cd -s ours am: 827172cee1 -s ours
...
am: fe997075417195e05dfa
2019-09-11 15:48:42 -07:00
Mady Mellor
91ba8e9b66
qt-r1-bubbles-dev @ build 5835883
...
Test: presubmit setup on source branch
Bug: 129158983
Bug: 136034310
Bug: 137876221
Change-Id: I5ade70c2101d09eed4698ce29bd3242483ec7f8b
Merged-In: If2b813f24cf5998829fe417e32179c5e8283d308
Merged-In: I58f0287ed99a4daf3758316e4004bca05f17b0d1
2019-09-11 22:42:17 +00:00
Mady Mellor
88de4328fd
Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev-plus-aosp
2019-09-11 22:40:20 +00:00
Xin Li
fe99707541
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: aac7f8e2cd -s ours
...
am: 827172cee17195e05dfa
2019-09-11 14:57:08 -07:00
Xin Li
827172cee1
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
...
am: aac7f8e2cd7195e05dfa
2019-09-11 14:09:27 -07:00
Bill Yi
55c230f407
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 09c08d1da0 -s ours am: 8191079b21 -s ours
...
am: f931d88a0b
2019-09-11 12:17:45 -07:00
Bill Yi
b9e51812d7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 09c08d1da0 -s ours am: 73a98df64b -s ours
...
am: 7303be2997
2019-09-11 12:17:04 -07:00
Android Build Merger (Role)
f931d88a0b
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 09c08d1da0 -s ours am: 8191079b21 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
2019-09-11 19:10:12 +00:00
Bill Yi
1cd4a7040e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 09c08d1da0 -s ours
...
am: 8191079b21
2019-09-11 12:10:01 -07:00
Bill Yi
7303be2997
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 09c08d1da0 -s ours
...
am: 73a98df64b
2019-09-11 12:09:59 -07:00
Bill Yi
73a98df64b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 09c08d1da0
2019-09-11 12:03:01 -07:00
Bill Yi
8191079b21
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: 09c08d1da0
2019-09-11 12:03:00 -07:00
Bill Yi
123901eba0
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 914bda7715 -s ours
...
am: 23269a9dce
2019-09-11 11:49:11 -07:00
TreeHugger Robot
09c08d1da0
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-09-11 18:41:53 +00:00
Bill Yi
23269a9dce
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
...
am: 914bda7715
2019-09-11 11:35:13 -07:00
TreeHugger Robot
914bda7715
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
2019-09-11 18:18:32 +00:00
TreeHugger Robot
1171eb2eca
Merge "Use TwoTargetPreference to replace customized layout"
2019-09-11 08:35:37 +00:00
Kevin Chang
ee15fa1c2d
Change disable accessibility service dialog layout
...
Bug: 140307087
Test: Visual
Change-Id: I78d573f121e2f799a8395fcd2d21ee48a5fffb23
2019-09-11 15:47:08 +08:00
Bill Yi
cbfbd39821
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I1ee6e4e49b18ed13ab3e431583d316c0663a4f8f
2019-09-10 22:37:57 -07:00
Bill Yi
9e58221558
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I1163141368fc482f675e7d9dd7b4503dfcd309bf
2019-09-10 22:24:00 -07:00
Raff Tsai
98b55c5214
Use TwoTargetPreference to replace customized layout
...
Bug: 139336138
Test: manual, robolectric
Change-Id: I0ffe90cd9ab5423b533507eeae47d5972704cf61
2019-09-11 13:08:47 +08:00
Raff Tsai
883cdcf87c
Merge "Fix settings panel refresh issue"
2019-09-11 04:58:06 +00:00
Bill Yi
235edcb18a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 7177991eba -s ours
...
am: 3efa2416a0
2019-09-10 21:14:55 -07:00
Bill Yi
3efa2416a0
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
...
am: 7177991eba
2019-09-10 21:08:03 -07:00
TreeHugger Robot
7177991eba
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
2019-09-11 03:43:27 +00:00
Bill Yi
dee0813c89
Merge "[automerger skipped] Import translations. DO NOT MERGE am: c1bfd1f50d -s ours am: 59cd1121cc -s ours
...
am: 8916a3cd66
2019-09-10 20:31:55 -07:00
Bill Yi
1c628f2e6b
[automerger skipped] Import translations. DO NOT MERGE am: c1bfd1f50d -s ours am: 805197327f -s ours
...
am: 5dcd93a895
2019-09-10 20:31:02 -07:00
