OSDN Git Service
Tsung-Mao Fang [Mon, 23 Sep 2019 05:43:06 +0000 (13:43 +0800)]
Show "Display over other apps" in search
Since there're same two keys in settings app,
search indexes this preference fail.
Test: Rebuild, and see search result again.
Bug:
141096384
Change-Id: I8b1edfe1728b44d98d59ba2e790b29e33901308a
Bill Yi [Sun, 22 Sep 2019 20:14:15 +0000 (13:14 -0700)]
Merge "[automerger skipped] Import translations. DO NOT MERGE am:
73915b77ed -s ours am:
cbfc75bb00 -s ours
am:
df8a9839fc -s ours
am skip reason: subject contains skip directive
Change-Id: I7e3017dd68cf06822a7e971a48f3fd271a6ebae2
Bill Yi [Sun, 22 Sep 2019 20:08:45 +0000 (13:08 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
73915b77ed -s ours am:
99f04da5dc -s ours
am:
66d00b68c6 -s ours
am skip reason: subject contains skip directive
Change-Id: I0eded95e9433b1779cecc3016fe880e9b567465b
Bill Yi [Sun, 22 Sep 2019 20:08:04 +0000 (13:08 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am:
59e1c0a768 -s ours
am:
f5e74d30d6 -s ours
am skip reason: subject contains skip directive
Change-Id: Iedf4b71e4cc4b2f81145cb2219c2413fb70412d7
Android Build Merger (Role) [Sun, 22 Sep 2019 19:59:59 +0000 (19:59 +0000)]
Merge "[automerger skipped] Import translations. DO NOT MERGE am:
73915b77ed -s ours am:
cbfc75bb00 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
Bill Yi [Sun, 22 Sep 2019 19:59:44 +0000 (12:59 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
73915b77ed -s ours
am:
99f04da5dc -s ours
am skip reason: subject contains skip directive
Change-Id: I6f6945b78fd9a192c61d03a0741f62e7ea93fdcb
Bill Yi [Sun, 22 Sep 2019 19:59:44 +0000 (12:59 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
73915b77ed -s ours
am:
cbfc75bb00 -s ours
am skip reason: subject contains skip directive
Change-Id: I93d10d5ed7938c69b3b26c3b22d9d56ebc03f6ed
Bill Yi [Sun, 22 Sep 2019 19:54:00 +0000 (12:54 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am:
59e1c0a768 -s ours
am skip reason: subject contains skip directive
Change-Id: Iaf1cc92e717e2a7cdada89267ee6b5f3cc55a5b0
Bill Yi [Sun, 22 Sep 2019 19:53:43 +0000 (12:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
73915b77ed -s ours
am skip reason: subject contains skip directive
Change-Id: Ief64a890db8759f6361b58d304ff4f7e333739c6
Bill Yi [Sun, 22 Sep 2019 19:53:43 +0000 (12:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
73915b77ed -s ours
am skip reason: subject contains skip directive
Change-Id: I31f45d935e2c9a13feb71186730b99fffc102c9b
TreeHugger Robot [Sun, 22 Sep 2019 19:42:36 +0000 (19:42 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
Bill Yi [Sun, 22 Sep 2019 14:52:20 +0000 (07:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I92110fede16a12a445efbd96896e17f46f89a203
Auto-generated-cl: translation import
Bill Yi [Sun, 22 Sep 2019 14:38:24 +0000 (07:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib6e2dcd3084a0399fec672c4fff3a51e8dd0d195
Auto-generated-cl: translation import
Edgar Wang [Sat, 21 Sep 2019 09:14:54 +0000 (02:14 -0700)]
Merge "Handle Aware sensor status for Always On" into qt-qpr1-dev am:
07ea1dc815
am:
18839c1fbc
Change-Id: Ief79ab0c23790d60650f1f6375c794a20872a8b1
Edgar Wang [Sat, 21 Sep 2019 09:07:52 +0000 (02:07 -0700)]
Merge "Handle Aware sensor status for Always On" into qt-qpr1-dev
am:
07ea1dc815
Change-Id: Ia7f62e46c3c9d7c9b7a55686be911891764ff75d
Edgar Wang [Sat, 21 Sep 2019 08:54:47 +0000 (08:54 +0000)]
Merge "Handle Aware sensor status for Always On" into qt-qpr1-dev
Edgar Wang [Thu, 19 Sep 2019 11:23:01 +0000 (19:23 +0800)]
Handle Aware sensor status for Always On
- "Always On" preference will be hiden when aware
sensor is available
- Extract NavModeCandidateInfo from SystemNavigationGestureSettings
Bug:
136610131
Test: robotest & manual
Change-Id: If58c70549339b66116f19df7193d85bb04e3f1b7
Edgar Wang [Thu, 19 Sep 2019 11:23:01 +0000 (19:23 +0800)]
Handle Aware sensor status for Always On
- "Always On" preference will be hiden when aware
sensor is available
- Extract NavModeCandidateInfo from SystemNavigationGestureSettings
Bug:
136610131
Test: robotest & manual
Change-Id: If58c70549339b66116f19df7193d85bb04e3f1b7
TreeHugger Robot [Fri, 20 Sep 2019 14:24:24 +0000 (14:24 +0000)]
Merge "Update notification log"
TreeHugger Robot [Fri, 20 Sep 2019 10:54:36 +0000 (10:54 +0000)]
Merge "Hide a11y usage when there is no enabled a11y service"
TreeHugger Robot [Fri, 20 Sep 2019 10:45:27 +0000 (10:45 +0000)]
Merge "Enabling sharding RunSettingsRoboTests"
Tsung-Mao Fang [Fri, 20 Sep 2019 09:02:47 +0000 (17:02 +0800)]
Hide a11y usage when there is no enabled a11y service
A11y usage still shows in privacy page after
user disable a11y with a11y usage dialog.
We need to check again whether there is any enabled a11y
after screen comes back to foreground.
Change-Id: Icf7aa7dc9d802765ec49df8651385397f454cd48
Fix:
140207216
Test: robotest
Stanley Wang [Fri, 20 Sep 2019 06:21:30 +0000 (06:21 +0000)]
Merge "Mobile data should be non-indexable when the subscription id is invalid."
Goven Liu [Fri, 20 Sep 2019 04:17:23 +0000 (04:17 +0000)]
Merge "[Wi-Fi] Cannot connect to hidden WiFi network."
Stanley Wang [Fri, 20 Sep 2019 02:23:00 +0000 (10:23 +0800)]
Mobile data should be non-indexable when the subscription id is invalid.
Return AVAILABLE_UNSEARCHABLE when the subscription id is invalid.
Fixes:
141289758
Test: manual and robotests
Change-Id: I86534182fca26bf7b56ee1ee7d6f573a142a6a3a
Stanley Wang [Fri, 20 Sep 2019 02:17:07 +0000 (02:17 +0000)]
Merge "Fix can't find the search result by input "4G Calling""
Kevin Chang [Fri, 20 Sep 2019 02:14:26 +0000 (02:14 +0000)]
Merge "Change disable accessibility service dialog layout"
Bonian Chen [Thu, 19 Sep 2019 20:32:01 +0000 (13:32 -0700)]
Merge "[Help Page] Support help content under 2 CDMA SIM" into qt-qpr1-dev am:
20290d0451
am:
3cce668981
Change-Id: I16c4e2ef30bd62acec5d4b54fe57ac1ff25dbb90
Bonian Chen [Thu, 19 Sep 2019 20:25:31 +0000 (13:25 -0700)]
Merge "[Help Page] Support help content under 2 CDMA SIM" into qt-qpr1-dev
am:
20290d0451
Change-Id: I0b3cb958eff31ede7daa3292987684c26e9111d5
Bonian Chen [Thu, 19 Sep 2019 20:07:20 +0000 (20:07 +0000)]
Merge "[Help Page] Support help content under 2 CDMA SIM" into qt-qpr1-dev
Mill Chen [Wed, 7 Aug 2019 08:34:17 +0000 (16:34 +0800)]
Enabling sharding RunSettingsRoboTests
Also fixed failed test cases caused by running
RunSettingsRoboTests with the sharding mechanism.
Bug:
130895860
Test: make RunSettingsRoboTests -j40
Change-Id: I0e5e0764d4ea910b9c0acc693d63a4b793e23d3a
Stanley Wang [Tue, 3 Sep 2019 07:45:42 +0000 (15:45 +0800)]
Fix can't find the search result by input "4G Calling"
Add indexable raw data for type 4G_CALLING or ADVANCED_CALL and
set the volte to non-indexable if current type is not volte.
Fixes:
137155154
Test: manual
Change-Id: I0992f9fb95e0b1cc23fb4f38f356ee0569f3b5b1
hughchen [Thu, 19 Sep 2019 08:57:14 +0000 (16:57 +0800)]
Change text size of header title in advanced bluetooth
1. change the text size of header title
2. Set gravity of header title as "center"
Bug:
138633953
Test: manually
Change-Id: I358c6a10e3cb97b46c3b8f6d50f7046414ddfb13
Bonian Chen [Wed, 11 Sep 2019 06:35:15 +0000 (14:35 +0800)]
[Help Page] Support help content under 2 CDMA SIM
Fix the design for displaying help content.
Launch help content from notification (PendingIntent) could not be resolved correctly.
Route through HelpTrampoline to fix it.
Bug:
139040358
Test: Manual with fake from framework side for dual CDMA SIM
Change-Id: Iff3a6e9095c3908b3c5b1a25e2535bcab1858ae2
Julia Reynolds [Wed, 18 Sep 2019 13:19:04 +0000 (09:19 -0400)]
Update notification log
- Change notification presentation to better match notification shade
- Stop constantly removing and readding all of the preferences
- Update individual preferences in a kind of hacky way (to be improved
later)
- Link notification entries to notification preferences screen
- Hide notification summaries
Bug:
137396965
Test: manual
Change-Id: Icdd54488b8bf659f6fe42af93e42cd21912fa4fe
Eran Messeri [Wed, 18 Sep 2019 12:16:58 +0000 (12:16 +0000)]
Merge "CredentialStorage: Install keys using KeyChain"
govenliu [Wed, 18 Sep 2019 08:56:22 +0000 (16:56 +0800)]
[Wi-Fi] Cannot connect to hidden WiFi network.
When click "Add network" to add a new network, user may ignore the "Hidden network" item, which is in "Advanced options". That will cause the added hidden network can not be connected.
To improve it, move the "Hidden network" from last one to be first one.
Bug:
135281908
Test: Check if the hidden setting spinner is the first one item in Advanced options.
Change-Id: I0f90a6b2992b38ccae461c07d6b13cda0ca9d2b2
TreeHugger Robot [Wed, 18 Sep 2019 06:04:53 +0000 (06:04 +0000)]
Merge "Fix volume panel hang"
Raff Tsai [Tue, 17 Sep 2019 15:47:07 +0000 (23:47 +0800)]
Fix volume panel hang
SliceLiveData changed its behavior, if slice is null, it will not
notify LiveData observer but callback to onErrorListener. We only
reduce PanelSlicesLoaderCountdownLatch in LiveData observer.
Therefore the error slice caused PanelSlicesLoaderCountdownLatch
never count to 0, the UI was not displayed. It is solved by reducing
PanelSlicesLoaderCountdownLatch in onErrorListener and also not return
null in MediaOutputIndicatorSlice.
Test: manual
Fixes:
141084035
Change-Id: Iddb2dbdc0e0d2ac3e26071960bb667937f181121
joshmccloskey [Wed, 18 Sep 2019 03:35:20 +0000 (20:35 -0700)]
Updated face remove dialog string. am:
7abb800c9f
am:
3b20d776fe
Change-Id: I32a6d7fb9467e3691e9493ec7f73ab56e8449539
joshmccloskey [Wed, 18 Sep 2019 03:30:28 +0000 (20:30 -0700)]
Updated face remove dialog string.
am:
7abb800c9f
Change-Id: I22d614cd7c6868e4c28d894ea2a3fe48f8266457
TreeHugger Robot [Wed, 18 Sep 2019 02:37:07 +0000 (02:37 +0000)]
Merge "Add the package of android into whitelist"
TreeHugger Robot [Wed, 18 Sep 2019 02:28:39 +0000 (02:28 +0000)]
Merge "Only add divider in recyclerView once"
joshmccloskey [Tue, 17 Sep 2019 20:04:08 +0000 (13:04 -0700)]
Updated face remove dialog string.
Test: Verified that the correct string shows after deleting
face data.
Fixes:
141145591
Change-Id: I836c79fb4775157ae4995f706e05d1fd1233bc8f
Neil Fuller [Tue, 17 Sep 2019 17:24:31 +0000 (10:24 -0700)]
Merge "Remove use of deprecated Time class" am:
b3f8696c4d am:
b83ddefb5c am:
42b55bc6f6
am:
ac3d9d8641
Change-Id: I71bc0a1411abc6433016554e073da5868df3b952
Neil Fuller [Tue, 17 Sep 2019 17:17:41 +0000 (10:17 -0700)]
Merge "Remove use of deprecated Time class" am:
b3f8696c4d am:
b83ddefb5c
am:
42b55bc6f6
Change-Id: I69ea913c7596017ab2d08dfe67c8376527d01603
Neil Fuller [Tue, 17 Sep 2019 17:06:03 +0000 (10:06 -0700)]
Merge "Remove use of deprecated Time class" am:
b3f8696c4d
am:
b83ddefb5c
Change-Id: Iafc1b00c254a5f7cc6af80b3eeeaf4418fbdbaf9
Neil Fuller [Tue, 17 Sep 2019 16:56:45 +0000 (09:56 -0700)]
Merge "Remove use of deprecated Time class"
am:
b3f8696c4d
Change-Id: Ie6dcfcde7ec223ed83b2d8d33f059924e3a566e9
Treehugger Robot [Tue, 17 Sep 2019 16:32:47 +0000 (16:32 +0000)]
Merge "Remove use of deprecated Time class"
Sunny Shao [Tue, 17 Sep 2019 14:28:07 +0000 (22:28 +0800)]
Add the package of android into whitelist
Add the package name android into config_reset_app_package_name
array list. To avoid running clear data on package android.
Fixes:
140520685
Test: manual test
Change-Id: I53dd0e7cf8060ae4455d05125fd3afd3acbeae13
Neil Fuller [Tue, 17 Sep 2019 12:53:17 +0000 (13:53 +0100)]
Remove use of deprecated Time class
Remove a use of the deprecated Time class.
Bug:
16550209
Test: treehugger only
Change-Id: If97b0d8ea78a76d613652ab623c3a48f5aa9aabb
TreeHugger Robot [Tue, 17 Sep 2019 09:11:56 +0000 (09:11 +0000)]
Merge "Replace png file with vector drawable"
Mady Mellor [Mon, 16 Sep 2019 22:34:34 +0000 (15:34 -0700)]
[automerger skipped] Merge "qt-r1-bubbles-dev @ build
5835883" into qt-qpr1-dev am:
eac42583a1 -s ours
am:
82c74accb0 -s ours
am skip reason: change_id If2b813f24cf5998829fe417e32179c5e8283d308 with SHA1
0c47113a5b is in history
Change-Id: I21d24bebf7ddd951a4caced854e9b7087b82850f
Mady Mellor [Mon, 16 Sep 2019 22:26:54 +0000 (15:26 -0700)]
[automerger skipped] qt-r1-bubbles-dev @ build
5835883 am:
91ba8e9b66 -s ours
am:
94e2682ad1 -s ours
am skip reason: change_id If2b813f24cf5998829fe417e32179c5e8283d308 with SHA1
0c47113a5b is in history
Change-Id: I69891547c7cbc131affa75c4dff4e27ae4b094a4
Mady Mellor [Mon, 16 Sep 2019 22:22:08 +0000 (15:22 -0700)]
[automerger skipped] Merge "qt-r1-bubbles-dev @ build
5835883" into qt-qpr1-dev
am:
eac42583a1 -s ours
am skip reason: change_id I58f0287ed99a4daf3758316e4004bca05f17b0d1 with SHA1
ea79e343f0 is in history
Change-Id: I80f853b777590b66aa8689e36864b381a947cb72
Mady Mellor [Mon, 16 Sep 2019 22:16:35 +0000 (15:16 -0700)]
[automerger skipped] qt-r1-bubbles-dev @ build
5835883
am:
91ba8e9b66 -s ours
am skip reason: change_id I58f0287ed99a4daf3758316e4004bca05f17b0d1 with SHA1
ea79e343f0 is in history
Change-Id: I4bcd05a7b87d9735c545a4599fffefc82e0c4856
Mady Mellor [Mon, 16 Sep 2019 21:55:52 +0000 (21:55 +0000)]
Merge "qt-r1-bubbles-dev @ build
5835883" into qt-qpr1-dev
Tsung-Mao Fang [Mon, 16 Sep 2019 07:09:40 +0000 (15:09 +0800)]
Only add divider in recyclerView once
Only add divider in recyclerView once or more and more dividers
will be set in recyclerView.
Change-Id: I765ed888d460be221341dafe3521a849b8dd3889
Fix:
139452947
Test: Show panel many times and see the divider.
Raff Tsai [Mon, 16 Sep 2019 03:41:37 +0000 (11:41 +0800)]
Replace png file with vector drawable
Fixes:
139336138
Test: visual
Change-Id: I6fa504d406e4b9b37b8260ec9fb92f265e4a45da
Bill Yi [Sun, 15 Sep 2019 22:34:56 +0000 (15:34 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
1ae748b09f -s ours
am:
e3f5ddcdfe -s ours
am skip reason: subject contains skip directive
Change-Id: Ieecf808857f0d95c4db6cd701e581d9c93baf22c
Bill Yi [Sun, 15 Sep 2019 22:28:41 +0000 (15:28 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
1ae748b09f -s ours
am skip reason: subject contains skip directive
Change-Id: Ibb1bf53b21569e91e4d9e1ce47577fa525aaaec0
Bill Yi [Sun, 15 Sep 2019 01:38:18 +0000 (18:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: If6b8f670eb54a3f5b45efa0ba2a540cd25327260
Auto-generated-cl: translation import
Ilya Matyukhin [Fri, 13 Sep 2019 09:34:52 +0000 (02:34 -0700)]
Merge "Fix "skip lock screen" not working for a secondary user" into qt-qpr1-dev am:
3df43a3eae
am:
4dfe356797
Change-Id: Id0fe0d8c491a76bed3108c59acf3bb7d7179101c
Ilya Matyukhin [Fri, 13 Sep 2019 09:28:52 +0000 (02:28 -0700)]
Merge "Fix "skip lock screen" not working for a secondary user" into qt-qpr1-dev
am:
3df43a3eae
Change-Id: Iaeaedcde2e27f07cb5849a2cf670219fd143b934
Ilya Matyukhin [Fri, 13 Sep 2019 09:10:32 +0000 (09:10 +0000)]
Merge "Fix "skip lock screen" not working for a secondary user" into qt-qpr1-dev
Ilya Matyukhin [Wed, 11 Sep 2019 20:58:12 +0000 (13:58 -0700)]
Fix "skip lock screen" not working for a secondary user
Bug:
140878309
Test: "Skip lock screen" is no longer grayed-out for a secondary user
Change-Id: I3aab6582bee07760b671034b0971c98b1c946a1c
Bill Yi [Fri, 13 Sep 2019 00:54:51 +0000 (17:54 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
86dfbd6254 -s ours am:
5c90432dc1 -s ours
am:
eeca546428 -s ours
am skip reason: subject contains skip directive
Change-Id: Id1d0ad08693f87b8433bb6707b10a10f976442ab
Bill Yi [Fri, 13 Sep 2019 00:50:21 +0000 (17:50 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
86dfbd6254 -s ours am:
edbddf7f42 -s ours
am:
3590e5d52c -s ours
am skip reason: subject contains skip directive
Change-Id: Id179916589bdb32c328b42136a4a9004a8da46ca
Bill Yi [Fri, 13 Sep 2019 00:49:20 +0000 (17:49 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
86dfbd6254 -s ours
am:
5c90432dc1 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic722d4de71c99e005a84f5650c8bf9c82c392cd0
Bill Yi [Fri, 13 Sep 2019 00:42:18 +0000 (17:42 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
86dfbd6254 -s ours
am:
edbddf7f42 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib0eeb1f2ac5bff404717b4550d48c32bc536ef61
Bill Yi [Fri, 13 Sep 2019 00:39:37 +0000 (17:39 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
86dfbd6254 -s ours
am skip reason: subject contains skip directive
Change-Id: I9979a3422b5926a7e210ded393484f6eb28e8600
Bill Yi [Fri, 13 Sep 2019 00:35:35 +0000 (17:35 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
f066797849 -s ours
am:
6ada8629a2 -s ours
am skip reason: subject contains skip directive
Change-Id: I4d460c8fd412c59964455dbf7190dfa2c0a9995f
Bill Yi [Fri, 13 Sep 2019 00:28:34 +0000 (17:28 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
f066797849 -s ours
am skip reason: subject contains skip directive
Change-Id: I83269163f1e1f3752a85cb4eaed860316efba142
Bill Yi [Fri, 13 Sep 2019 00:28:33 +0000 (17:28 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
86dfbd6254 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib139ea535e149923d50d835e030636df7edbf7cc
Bill Yi [Thu, 12 Sep 2019 23:10:45 +0000 (16:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I27cfc6c9ffa9def49d83eea920b88a5ce762fb53
Auto-generated-cl: translation import
Bill Yi [Thu, 12 Sep 2019 22:54:53 +0000 (15:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1cf797286a22443416d4b401e38f8923bb4edd43
Auto-generated-cl: translation import
cosmohsieh [Thu, 12 Sep 2019 21:21:32 +0000 (14:21 -0700)]
[automerger skipped] Merge "[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection" into qt-qpr1-dev am:
17cbea0112
am:
7aee812888 -s ours
am skip reason: change_id I4b06c9772598ab3f9416f32456cd0a65e2d70d68 with SHA1
0f2773fb78 is in history
Change-Id: I1a7f5d4f59880bf675f8971082174fb336d268eb
cosmohsieh [Thu, 12 Sep 2019 21:09:30 +0000 (14:09 -0700)]
Merge "[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection" into qt-qpr1-dev
am:
17cbea0112
Change-Id: Icc3c00f542746c1ffa423c04c160ba85e53ad834
TreeHugger Robot [Thu, 12 Sep 2019 20:49:56 +0000 (20:49 +0000)]
Merge "[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection" into qt-qpr1-dev
Eran Messeri [Tue, 10 Sep 2019 16:40:28 +0000 (17:40 +0100)]
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
TreeHugger Robot [Thu, 12 Sep 2019 11:22:40 +0000 (11:22 +0000)]
Merge "Merge similar BaseSearchIndexProvider code together"
TreeHugger Robot [Thu, 12 Sep 2019 10:05:01 +0000 (10:05 +0000)]
Merge "Replace png file with vector drawable"
Arc Wang [Thu, 12 Sep 2019 08:21:54 +0000 (01:21 -0700)]
[automerger skipped] Merge "[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network" into qt-qpr1-dev am:
ec3055b9eb
am:
40f22313dc -s ours
am skip reason: change_id Iddc1dae53849760f43b41b75262358dff6ba09af with SHA1
9db4bf7dbb is in history
Change-Id: Ieb15ac82f64bb17a8a3bfcf0dfa31cb7640bfc86
Arc Wang [Thu, 12 Sep 2019 08:14:57 +0000 (01:14 -0700)]
Merge "[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network" into qt-qpr1-dev
am:
ec3055b9eb
Change-Id: I89755845ae509051e4fc2fcfb8f1dd1ee5ab195c
TreeHugger Robot [Thu, 12 Sep 2019 08:05:21 +0000 (08:05 +0000)]
Merge "[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network" into qt-qpr1-dev
Raff Tsai [Thu, 12 Sep 2019 07:24:43 +0000 (15:24 +0800)]
Replace png file with vector drawable
Bug:
139336138
Test: visual
Change-Id: I2c97accbb7a4e693f50d23ee340cbc5c09101747
Bill Yi [Thu, 12 Sep 2019 06:04:52 +0000 (23:04 -0700)]
Merge "[automerger skipped] Import translations. DO NOT MERGE am:
8173de150d -s ours am:
9b956eb47f -s ours
am:
a5c810d4a2 -s ours
am skip reason: subject contains skip directive
Change-Id: I636c33ea04b552a66024e99e1fa337f4808628d7
Bill Yi [Thu, 12 Sep 2019 06:04:21 +0000 (23:04 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
8173de150d -s ours am:
e6107df474 -s ours
am:
c46430c80e -s ours
am skip reason: subject contains skip directive
Change-Id: I93cd460214154bb1443bf1a37499eff0ece851c8
Bill Yi [Thu, 12 Sep 2019 06:03:33 +0000 (23:03 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
deee385ba8 -s ours
am:
525b411585 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib2951aec554167b13c9c5000dae4dbbdd2975587
Android Build Merger (Role) [Thu, 12 Sep 2019 05:57:41 +0000 (05:57 +0000)]
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
Bill Yi [Thu, 12 Sep 2019 05:57:29 +0000 (22:57 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
8173de150d -s ours
am:
9b956eb47f -s ours
am skip reason: subject contains skip directive
Change-Id: I56786fa936a90e1870aa8b49ccd3eb1e4e1c2de3
Bill Yi [Thu, 12 Sep 2019 05:57:28 +0000 (22:57 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
8173de150d -s ours
am:
e6107df474 -s ours
am skip reason: subject contains skip directive
Change-Id: I3fe8c6432c4b840365aeebdbf2c455a4e98bd514
Bill Yi [Thu, 12 Sep 2019 05:54:54 +0000 (22:54 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
deee385ba8 -s ours
am skip reason: subject contains skip directive
Change-Id: I270de5daddcee5c1ed3c779bcad217dd1526cbe8
Bill Yi [Thu, 12 Sep 2019 05:50:29 +0000 (22:50 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
8173de150d -s ours
am skip reason: subject contains skip directive
Change-Id: I010ba47035a6530ec5d50abd363a6ea013515551
Bill Yi [Thu, 12 Sep 2019 05:50:27 +0000 (22:50 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
8173de150d -s ours
am skip reason: subject contains skip directive
Change-Id: Ica53f59adc22c9442b6c823abc35a63c2e864d8e
Raff Tsai [Thu, 12 Sep 2019 02:56:13 +0000 (10:56 +0800)]
Merge similar BaseSearchIndexProvider code together
Bug:
135053028
Test: robolectric, check search_index.db contains the same items
Change-Id: If3c18a170b0e671690df1fdf26e59a421d2c48cd
Bill Yi [Thu, 12 Sep 2019 02:26:07 +0000 (19:26 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I1b2826dd790519a2946d8505aec03f72b1815f04
Bill Yi [Thu, 12 Sep 2019 02:10:50 +0000 (19:10 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I60bd87b13925d699bc7db9f6f215321ff20eea44
Mady Mellor [Thu, 12 Sep 2019 00:17:30 +0000 (17:17 -0700)]
[automerger skipped] Merge "qt-r1-bubbles-dev @ build
5835883" into qt-qpr1-dev-plus-aosp
am:
88de4328fd -s ours
am skip reason: change_id If2b813f24cf5998829fe417e32179c5e8283d308 with SHA1
0c47113a5b is in history
Change-Id: I35a625ba0a09a0a35da1f38795dc34201838a084
Mady Mellor [Wed, 11 Sep 2019 23:58:43 +0000 (16:58 -0700)]
[automerger skipped] qt-r1-bubbles-dev @ build
5835883
am:
ea79e343f0 -s ours
am skip reason: change_id If2b813f24cf5998829fe417e32179c5e8283d308 with SHA1
0c47113a5b is in history
Change-Id: I34ca5d05f45a44be0eed2f4bdf8a6a733794a1fd
OSDN Git Service
