Commit Graph

60126 Commits

Author SHA1 Message Date
Bonian Chen
a65de8cd51 Merge "[Settings] Replace ImsManager#getImsServiceState()" into rvc-dev am: c073abaf2e
Change-Id: Id53c6a31d6c3dcf61482f1d3fcff13bb17a6ffa3
2020-03-19 04:48:29 +00:00
Betty Chang
74304904c7 [automerger skipped] Merge "[Mainline] Use public method in SubscriptionManager for mainline" am: e5f9bde2fd am: f695abfc29 -s ours
am skip reason: Change-Id I4d6113561906af5c9e4ac7737aefac17c926059a with SHA-1 db816c9dad is in history

Change-Id: I3e3d9481426bbb02dc7be34dfabd95a35731cda2
2020-03-19 04:42:42 +00:00
Chalard Jean
e0b336d7a4 Adjust code for API council feedback
Bug: 151322799
Test: SettingsUnitTests

Change-Id: I5ff389f3f707e5538979830c2252455bea5bbb88
2020-03-19 13:42:40 +09:00
Bonian Chen
c073abaf2e Merge "[Settings] Replace ImsManager#getImsServiceState()" into rvc-dev 2020-03-19 04:35:39 +00:00
Betty Chang
f695abfc29 Merge "[Mainline] Use public method in SubscriptionManager for mainline" am: e5f9bde2fd
Change-Id: I3a4b569e11a2c8235ce9adfa051cd6f795a02678
2020-03-19 04:29:29 +00:00
SongFerngWang
6c9ce4d892 Fix sim pin lock preference disappear in dual sim.
If one sim hide the preference and another one show the preference,
the preference always hide. The root cause is config value is wrong.
It should get config with subid.

Bug: 149800931
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SimLockPreferenceControllerTest
Change-Id: I91b551bc363b8ecb0a4b6b40e9de79c74ccd76fd
Merged-In: I91b551bc363b8ecb0a4b6b40e9de79c74ccd76fd
2020-03-19 12:13:37 +08:00
Betty Chang
e5f9bde2fd Merge "[Mainline] Use public method in SubscriptionManager for mainline" 2020-03-19 04:09:34 +00:00
Lee Chou
443cfd2ef4 Adds logging to confirm esim deletion feature
Bug: 138861284
Test: make SettingsGoogle  and manual testing
Change-Id: Ie5f6f6a31003733ae7abd9c04e9b3c371d5051c4
2020-03-19 12:07:01 +08:00
SongFerngWang
4f0d7b3781 [5G settings UI] add String for the 5G limited VoLTE dialog
while User disable VoLTE, UE show warning Dialog for 5G disable
add String for it.

Bug: 151313654
Test: build pass.
Change-Id: I2246664f1acbd2489dc3540486a7e1fa08d66656
2020-03-19 11:17:45 +08:00
TreeHugger Robot
97cc247663 Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d
Change-Id: Icad20acd12a7bf4e2ee9f95c389c590e3d458071
2020-03-19 02:52:30 +00:00
Varun Anand
310ddbb79f Fix the availability of UseOpenWifiPreferenceController.
Right now, it crashes if mEnableUseWifiComponentName is disabled by the
open wifi app.

Bug: 150773571
Test: manual - along with ag/10741759, verified that disabling
mEnableUseWifiComponentName hides the toggle instead of causing crash.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=UseOpenWifiPreferenceControllerTest

Change-Id: I47e36fab411e4e4d1a23b7c91504139f124222e1
2020-03-18 19:50:50 -07:00
Michael Groover
3d8974723a Add developer option to disable automatic adb grant revocation
Android 10 introduced a security feature to automatically revoke
adb authorizations for systems that have not reconnected to the device
within 7 days. While this is helpful for consumers that enable adb for
a one time task and mistakenly select the 'always allow' option,
feedback has indicated having a developer option to disable this feature
would be beneficial.

Bug: 119510647
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AdbAuthorizationTimeoutPreferenceControllerTest
Change-Id: I7eb123e8c69956aa02bb679784ac79650baf5dcb
2020-03-18 19:37:54 -07:00
TreeHugger Robot
c114c5b59d Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev 2020-03-19 02:36:55 +00:00
Tim Peng
650eda307b Close panel when media stop
-Add forceClose callback to finish panel
-Add test cases

Bug: 151396986
Test: make -j50 RunSettingsRoboTests
Change-Id: Ic0ac2880a4ff412382816ccb41b4fbb60dbdf519
2020-03-19 10:02:35 +08:00
Treehugger Robot
9bbd35b576 [automerger skipped] Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" am: 84fab912b0 am: e18b79d22d -s ours
am skip reason: Change-Id I5aecfa4b5a8e371b914573ddd080acb98078bfca with SHA-1 3e0f661f11 is in history

Change-Id: Ibe2c542a784ff8309de5fd6a370050d5a0aed8bd
2020-03-19 01:46:07 +00:00
Treehugger Robot
e18b79d22d Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" am: 84fab912b0
Change-Id: I95089501349894acad9e09b4417c74657a906722
2020-03-19 01:37:20 +00:00
Treehugger Robot
84fab912b0 Merge "Revert "Revert "Pass in active device to all BluetoothA2dp APIs ..."" 2020-03-19 01:36:09 +00:00
Peter Wang
4aeb063f75 [API Review] APIs in SubscriptionManager
Bug: 146362772
Bug: 148180034
Test: atest SubscriptionControllerTest, TelephonyDatabaseHelperTest, TelephonyProviderTest
Change-Id: I7bb9b088f1a08aaac5b43f264a77272aa52d562d
2020-03-18 16:50:31 -07:00
Anthony Stange
d7c3458743 Merge "Revert "Show only listUIChanges instead of all"" into rvc-dev am: 95975931be
Change-Id: I5a5af738409ba0c73ea0062e0a973702baab7f03
2020-03-18 21:56:30 +00:00
Anthony Stange
95975931be Merge "Revert "Show only listUIChanges instead of all"" into rvc-dev 2020-03-18 21:52:29 +00:00
Blake Kragten
ac9917a6be Merge "Enhanced Connectivity Enabled Default" into rvc-dev am: 75f0bdb400
Change-Id: Ifcc874f67cc3197153789fafb1077876b0a333b1
2020-03-18 21:51:49 +00:00
Anthony Stange
2012e6706a Revert "Show only listUIChanges instead of all"
Revert submission 10721220-hide

Reason for revert: Caused build breakage - b/151857606
Reverted Changes:
I7c725a1ec:Show only listUIChanges instead of all
Iec8755171:Introduce listUIChanges API for developer UI

Change-Id: I7753051b06faf1f48a818a134d1eda2500f817f8
2020-03-18 21:33:10 +00:00
Blake Kragten
75f0bdb400 Merge "Enhanced Connectivity Enabled Default" into rvc-dev 2020-03-18 21:25:11 +00:00
Rubin Xu
1d01ee0d97 Merge "Do not reset incorrect password attempts after biometric authentication" into rvc-dev am: b79e01680d
Change-Id: I6dda830e2e54011d505a70bdb8a10593dc8adbdd
2020-03-18 19:02:24 +00:00
Rubin Xu
b79e01680d Merge "Do not reset incorrect password attempts after biometric authentication" into rvc-dev 2020-03-18 18:48:23 +00:00
Anna Trostanetski
9d653e5298 Merge "Show only listUIChanges instead of all" into rvc-dev am: 49187777dd
Change-Id: I7f238ccc501bf9a359c129ab019e627eb1be16d3
2020-03-18 18:18:29 +00:00
Anna Trostanetski
49187777dd Merge "Show only listUIChanges instead of all" into rvc-dev 2020-03-18 18:15:52 +00:00
PETER LIANG
e0ec4b853b Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb
Change-Id: I97f07e429505e23ca5e7ff34e1f48dd635c1d780
2020-03-18 12:08:16 +00:00
PETER LIANG
76fb737beb Merge "Revise strings for tutorial improvement." into rvc-dev 2020-03-18 11:50:18 +00:00
Rubin Xu
397ee8b563 Do not reset incorrect password attempts after biometric authentication
For work challenges, do not reset incorrect password attempts if
challenge is resolved via biometric authentication. This is the
behaviour for personal keyguard and work challenge should be
consistent.

Bug: 139438785
Test: manual: enroll work challenge with fingerprint, set failed wipe
count (3) via TestDPC and attempt two failed attempts (via cmd
lock_settings). Resolve work challenge with fingerprint and attempt one
last failed attempt. Verify work profiel is wiped.

Change-Id: Ic64d3e44f3faa5adf8ac43db09e33c8403427990
2020-03-18 11:38:30 +00:00
robertluo
7f11d3f74a Rename "Tap & pay" to "Contactless payments"
Fixes: 149270345
Test: manual and check if new string is applied
Change-Id: I412c5b5681a85d482541ae30faa13e904942b612
Merged-In: I412c5b5681a85d482541ae30faa13e904942b612
(cherry picked from commit 86a6cb8ead)
2020-03-18 10:51:58 +00:00
changbetty
e9f857621f [Mainline] Use public method in SubscriptionManager for mainline
- getActiveSubscriptionIdList
   To use getActiveSubscriptionInfoList to get subscription Id list
 - getActiveSubscriptionInfoList(Z)
   To use getActiveSubscriptionInfoList() instead

Bug: 144478274
Test:  make RunSettingsRoboTests ROBOTEST_FILTER=SimLockPreferenceControllerTest
       make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkUtilsTest

Change-Id: I4d6113561906af5c9e4ac7737aefac17c926059a
Merged-In: I4d6113561906af5c9e4ac7737aefac17c926059a
2020-03-18 10:33:39 +00:00
Peter_Liang
8b411bfa55 Revise strings for tutorial improvement.
Bug: 148989018
Test: manual test
Change-Id: I249c5ae896123b546b028c959cd1a5404008aec3
2020-03-18 17:24:16 +08:00
TreeHugger Robot
e281086ce3 Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda
Change-Id: I3ddb79684d912b7c336a6ffaf165a2a7ab1b5c06
2020-03-18 05:37:21 +00:00
TreeHugger Robot
a2a1056dda Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev 2020-03-18 05:22:27 +00:00
Menghan Li
f8eb71c324 Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4
Change-Id: Id7d2b3ffd27ec01ff3bc2eb8a96dcfecb857b0a3
2020-03-18 01:05:52 +00:00
Menghan Li
a56e57eaa4 Merge "Update R accessibility assets and strings (5/n)" into rvc-dev 2020-03-18 00:50:43 +00:00
atrost
06da8b6ebc Show only listUIChanges instead of all
Use the new method that filters out changes that shouldn't be in the
developer UI.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=PlatformCompatDashboardTest
Bug: 151299145
Change-Id: I7c725a1eca32e2d253b9671c789777b5422ed469
2020-03-17 20:37:49 +00:00
Eric Sandness
66df88126f Use ChooseLockGeneric When Started By Admin App am: 7430932305
Change-Id: I78fd46587c0d3c598867c972bb9c9df038b30a1b
2020-03-17 20:34:12 +00:00
Sarah Chin
20974b6814 5G meteredness for telephony framework
Add listener for SubscriptionPlans changed

Bug: 151630253
Test: atest FrameworksTelephonyTests
Change-Id: I0c8e84f74fd1f69ffc7e1046819966fcb04732a6
Merged-In: I0c8e84f74fd1f69ffc7e1046819966fcb04732a6
2020-03-17 18:47:07 +00:00
Eric Sandness
7430932305 Use ChooseLockGeneric When Started By Admin App
The device management app may run before the end of device provisioning,
and it may start SetNewPasswordActivity.  If this happens, use
ChooseLockGeneric instead of SetupChooseLockGeneric.  Only use
SetupChoseLockGeneric if SetNewPasswordActivity was started by Setup
Wizard itself.

Fixes: 151552453
Test: atest com.android.settings.password.SetNewPasswordActivityTest
Test: atest com.android.settings.password.ChooseLockGenericTest
Test: Manually run consumer and enterprise device setup
Change-Id: I3b479ed18211d6625654f266fe692f07d0047e4f
2020-03-17 17:16:08 +00:00
Automerger Merge Worker
b98a90bfa2 [automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours
am skip reason: subject contains skip directive

Change-Id: I8ce297d4d28cbf33b51c59c9ed71c12044c211e3
2020-03-17 15:27:12 +00:00
Automerger Merge Worker
b67ed25932 Merge "Fix strings for certificate installation in Settings" into rvc-dev am: e61aaaab51
Change-Id: I7c2992488d3ab3d552a12e207093d1deffee4ded
2020-03-17 15:26:33 +00:00
Automerger Merge Worker
f9b7313545 [automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours
am skip reason: subject contains skip directive

Change-Id: Id75d1c9d9ba97160bfa72e8bcdde3a0407856157
2020-03-17 15:11:40 +00:00
Automerger Merge Worker
94f905bd9d [automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours
am skip reason: subject contains skip directive

Change-Id: Icd688c1135ffd48dd178eaf2a7e3665e85deca52
2020-03-17 15:11:36 +00:00
Alex Johnston
e61aaaab51 Merge "Fix strings for certificate installation in Settings" into rvc-dev 2020-03-17 15:07:18 +00:00
Automerger Merge Worker
618ebc3fdf Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45
Change-Id: I5914dc21bfa9659fe8ad7abfff027aa10ab5c210
2020-03-17 13:28:15 +00:00
menghanli
d1adcc61a2 Update R accessibility assets and strings (5/n)
- Magnification rich content
- Color inversion rich content

Bug: 148837311
Test: Manual test
Change-Id: I4dc52aa00f22cba9cea0c91be3af0b9cb7093182
2020-03-17 21:12:15 +08:00
Yanting Yang
9204d76c45 Merge "Remove the index of the homepage category tiles" into rvc-dev 2020-03-17 13:11:40 +00:00
Automerger Merge Worker
c63489139c Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510
Change-Id: Ic2788de5e3d7926813d5f36293cef55f67edc131
2020-03-17 13:03:09 +00:00