Bonian Chen
c073abaf2e
Merge "[Settings] Replace ImsManager#getImsServiceState()" into rvc-dev
2020-03-19 04:35:39 +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
TreeHugger Robot
13d84b4a96
Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d am: dde6e031f7 am: 56cd70f100
...
Change-Id: Icfd2a5d5b651f3eed97e32a744d3338857d66043
2020-03-19 03:23:00 +00: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
56cd70f100
Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d am: dde6e031f7
...
Change-Id: I311015bab8db333bb1f87a7cfe436d4cfe5e48fa
2020-03-19 03:12:47 +00:00
TreeHugger Robot
dde6e031f7
Merge "Rename "Tap & pay" to "Contactless payments"" into rvc-dev am: c114c5b59d
...
Change-Id: Id07e6022613be6dd8a34d25d1004bb15fe52b0cd
2020-03-19 02:52:01 +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
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
88e410a984
Merge "Revert "Show only listUIChanges instead of all"" into rvc-dev am: 95975931be am: c984a18721 am: 8488fd6e51
...
Change-Id: I7f7760799eec2cf731641c45d5dc5c7cb423f425
2020-03-18 22:30:53 +00:00
Blake Kragten
054662536a
Merge "Enhanced Connectivity Enabled Default" into rvc-dev am: 75f0bdb400 am: d19b162a1b am: fd60c1bee3
...
Change-Id: I625db0e64a2517ec30bfc48d439c78bb76c21a89
2020-03-18 22:29:05 +00:00
Anthony Stange
8488fd6e51
Merge "Revert "Show only listUIChanges instead of all"" into rvc-dev am: 95975931be am: c984a18721
...
Change-Id: Id6ac8894027d1a45c8cf74fbc922de43dd4fe438
2020-03-18 22:13:46 +00:00
Blake Kragten
fd60c1bee3
Merge "Enhanced Connectivity Enabled Default" into rvc-dev am: 75f0bdb400 am: d19b162a1b
...
Change-Id: Ib4156289d781519d825cdb08d7894fd4197db8da
2020-03-18 22:11:50 +00:00
Anthony Stange
c984a18721
Merge "Revert "Show only listUIChanges instead of all"" into rvc-dev am: 95975931be
...
Change-Id: I70421ccd985810c8a17910b71986f12296fc65f5
2020-03-18 21:55:15 +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
d19b162a1b
Merge "Enhanced Connectivity Enabled Default" into rvc-dev am: 75f0bdb400
...
Change-Id: I5dd0af4e65117be6b5f28ee3ab91ea73a977c4fc
2020-03-18 21:50:16 +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
d7c504b396
Merge "Do not reset incorrect password attempts after biometric authentication" into rvc-dev am: b79e01680d am: 8d4aca50c6 am: 732276494e
...
Change-Id: I2975bc0e1fd1c33a30ef9532facd1d3eacc0bd5a
2020-03-18 19:30:04 +00:00
Rubin Xu
732276494e
Merge "Do not reset incorrect password attempts after biometric authentication" into rvc-dev am: b79e01680d am: 8d4aca50c6
...
Change-Id: I903b29d130cfb6581343e8cf07fd78e152ef1692
2020-03-18 19:15:20 +00:00
Rubin Xu
8d4aca50c6
Merge "Do not reset incorrect password attempts after biometric authentication" into rvc-dev am: b79e01680d
...
Change-Id: I5393bbdeaa05c60f4bd107b556bada17dd6c9726
2020-03-18 19:02:34 +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
013cc850b9
Merge "Show only listUIChanges instead of all" into rvc-dev am: 49187777dd am: c5cdb8ec58 am: c386f37f9b
...
Change-Id: I60edbcde586f43415ee376cf7405f6434df5b7bb
2020-03-18 18:37:21 +00:00
Anna Trostanetski
c386f37f9b
Merge "Show only listUIChanges instead of all" into rvc-dev am: 49187777dd am: c5cdb8ec58
...
Change-Id: I9498322c8fb64c73c07bf32561927c39bb0ae070
2020-03-18 18:20:33 +00:00
Anna Trostanetski
c5cdb8ec58
Merge "Show only listUIChanges instead of all" into rvc-dev am: 49187777dd
...
Change-Id: Ia767e2ec4fbe88a646784290769e7bac692c8cac
2020-03-18 18:18:15 +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
f0c85d278c
Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb am: 6acf430dfa am: 1bb9e8ea7a
...
Change-Id: Ifc1d74c3111829cf81d77c6ea155540ea7d1c075
2020-03-18 12:54:44 +00:00
PETER LIANG
1bb9e8ea7a
Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb am: 6acf430dfa
...
Change-Id: If267e5c69924bbc1ea8a047f9b5db8944a6a9251
2020-03-18 12:36:02 +00:00
PETER LIANG
6acf430dfa
Merge "Revise strings for tutorial improvement." into rvc-dev am: 76fb737beb
...
Change-Id: I3289e93f31d29e4bfba953e775b2097ddf776e26
2020-03-18 12:08:08 +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
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
7673cfa430
Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: 17962d8186 am: 8212c33768
...
Change-Id: I06bb2b3b3698e91f35d7bc54d798c917185fbb42
2020-03-18 06:01:02 +00:00
TreeHugger Robot
8212c33768
Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: 17962d8186
...
Change-Id: Ic8f5ed6ee3132904f00e74f53259aeb274c82fed
2020-03-18 05:49:02 +00:00
TreeHugger Robot
17962d8186
Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda
...
Change-Id: I260656236087cc7a0bff2f278a90dc7f3d52b688
2020-03-18 05:37:14 +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
6be3263f5c
Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 am: 1b14eb0eef am: 29d33f3922
...
Change-Id: I0717caf7787cc4ee1cfc5acac204e7753a4d2680
2020-03-18 01:29:57 +00:00
Menghan Li
29d33f3922
Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4 am: 1b14eb0eef
...
Change-Id: Ia350ab892c9356a4f4aa02be26a1c28d625238cd
2020-03-18 01:18:26 +00:00
Menghan Li
1b14eb0eef
Merge "Update R accessibility assets and strings (5/n)" into rvc-dev am: a56e57eaa4
...
Change-Id: I43d9c46d008f794cb4763356de0c8e15b11df236
2020-03-18 01:05:24 +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
Eric Sandness
31f1136d1d
Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 29a37648ea am: ea2c433f17
...
Change-Id: I496a3bd8d3537355b746cdd275de7924c63bf064
2020-03-17 21:02:48 +00:00
Eric Sandness
ea2c433f17
Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 29a37648ea
...
Change-Id: Ibe1ecf76d11cfcb70935c88fb5c0df69eeab567a
2020-03-17 20:46:06 +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
29a37648ea
Use ChooseLockGeneric When Started By Admin App am: 7430932305
...
Change-Id: I1a2cacc0c556b9ebdedf579ffe8516b7851f02dd
2020-03-17 20:34:49 +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
b7d23d13b8
[automerger skipped] Import translations. DO NOT MERGE am: 8f23d00553 -s ours am: f9b7313545 -s ours am: d9dcf5bed2 -s ours am: 0245d4c0f6 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Iebba4194d915bfd2b104a16a8eae123999663a21
2020-03-17 15:55:21 +00:00