Lee Chou
70eb62ac49
Merge "Adds logging to confirm esim deletion feature" into rvc-dev am: fbde0b3b39 am: 01ea52c474
...
Change-Id: I6e2cb5666fd786755c94d8f398649bab083b2293
2020-03-19 08:05:41 +00:00
Lee Chou
7bb14b02f1
Merge "Adds logging to confirm esim deletion feature" into rvc-dev am: fbde0b3b39
...
Change-Id: I33ded07c61539326cd78839c2006a12bb4fe017e
2020-03-19 07:46:31 +00:00
Lee Chou
fbde0b3b39
Merge "Adds logging to confirm esim deletion feature" into rvc-dev
2020-03-19 07:44:20 +00:00
tim peng
b437f1b7e4
Merge "Close panel when media stop" into rvc-dev am: 91ad46fa60 am: 01d3b13273 am: 65c0fd1747 am: 5ecb29d9aa
...
Change-Id: I0cbe73e5fac981148574980656cf415644fbd50a
2020-03-19 07:10:58 +00:00
tim peng
65c0fd1747
Merge "Close panel when media stop" into rvc-dev am: 91ad46fa60 am: 01d3b13273
...
Change-Id: Ie9461236f3f801f1eaa6c07420829f51d680fc72
2020-03-19 06:40:38 +00:00
tim peng
8e8ac25c41
Merge "Close panel when media stop" into rvc-dev am: 91ad46fa60
...
Change-Id: I0015e42b8a6e1bf4fd0c96807e2465a12af84df9
2020-03-19 06:26:54 +00:00
tim peng
91ad46fa60
Merge "Close panel when media stop" into rvc-dev
2020-03-19 06:08:05 +00:00
Bonian Chen
edfa0d3277
Merge "[Settings] Replace ImsManager#getImsServiceState()" into rvc-dev am: c073abaf2e am: a65de8cd51 am: 0013a04115 am: 7b196f6b84
...
Change-Id: Iac3dc794074338f1c4491dcb7b97964fb3f8df91
2020-03-19 05:54:16 +00:00
Bonian Chen
a65de8cd51
Merge "[Settings] Replace ImsManager#getImsServiceState()" into rvc-dev am: c073abaf2e
...
Change-Id: Id53c6a31d6c3dcf61482f1d3fcff13bb17a6ffa3
2020-03-19 04:48:29 +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
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
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
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
d36930fc53
Merge "Revert "Show only listUIChanges instead of all"" into rvc-dev am: 95975931be am: c984a18721 am: 5c873f2087 am: 6f2143fa1c
...
Change-Id: I786a2e1888650834c7118ecd59872a7e9d08b052
2020-03-18 22:52:04 +00:00
Blake Kragten
6d15bb3d0d
Merge "Enhanced Connectivity Enabled Default" into rvc-dev am: 75f0bdb400 am: d19b162a1b am: 9c5a63edd2 am: ac1478c9ce
...
Change-Id: Ib2d7898fc5a203017660995a29ef45bd3226d9fd
2020-03-18 22:49:08 +00:00
Anthony Stange
5c873f2087
Merge "Revert "Show only listUIChanges instead of all"" into rvc-dev am: 95975931be am: c984a18721
...
Change-Id: I8d2845ce0a3fbd9126763486e89fe36968c39a3b
2020-03-18 22:13:11 +00:00
Blake Kragten
9c5a63edd2
Merge "Enhanced Connectivity Enabled Default" into rvc-dev am: 75f0bdb400 am: d19b162a1b
...
Change-Id: I82fe7853da86b2802a1bc77fa1ddc3d2d535ec2e
2020-03-18 22:12:02 +00: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
7039c29aa4
Merge "Do not reset incorrect password attempts after biometric authentication" into rvc-dev am: b79e01680d am: 8d4aca50c6 am: 9808d41e62 am: f765608b56
...
Change-Id: Ia956269790222ff25521207c1a9c7aef161d882a
2020-03-18 19:42:20 +00:00
Anthony Stange
ef4df5132f
Merge "Revert "[API Review] APIs in SubscriptionManager""
2020-03-18 19:41:22 +00:00
Anthony Stange
88de094fe8
Revert "[API Review] APIs in SubscriptionManager"
...
Revert submission 10700361-api-compile
Reason for revert: Build breakage
Reverted Changes:
I06280dbb0:[API Review] APIs in SubscriptionManager
I7bb9b088f:[API Review] APIs in SubscriptionManager
Iefc047f1f:[API Review] APIs in SubscriptionManager
I02dcb21cd:[API Review] APIs in SubscriptionManager
Ibedb31825:[API Review] APIs in SubscriptionManager
I77cad8f82:[API Review] APIs in SubscriptionManager
I80a51d2b8:[API Review] APIs in SubscriptionManager
Change-Id: I327cb795c724239316a2eaf306d983c2b896a3fe
2020-03-18 19:33:47 +00:00
Rubin Xu
9808d41e62
Merge "Do not reset incorrect password attempts after biometric authentication" into rvc-dev am: b79e01680d am: 8d4aca50c6
...
Change-Id: I2937deadc83562051747b19233548c0446787343
2020-03-18 19:15:08 +00:00
Anna Trostanetski
fcc13f24f5
Merge "Show only listUIChanges instead of all" into rvc-dev am: 49187777dd am: 9d653e5298 am: 038b9549a8 am: ad75e96c91
...
Change-Id: I6b93e4388c00a4c79d7a2376399603bb332c17b6
2020-03-18 19:11:44 +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
Peter Wang
88afe392fc
Merge "[API Review] APIs in SubscriptionManager"
2020-03-18 18:53:15 +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
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
TreeHugger Robot
f0c9ee7e39
Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: 17962d8186 am: 5e7b076c2d am: e6e0431e66
...
Change-Id: Ic11e5d15f0db219d8025062d2def6ad5c98c413e
2020-03-18 06:10:40 +00:00
TreeHugger Robot
5e7b076c2d
Merge "[Wi-Fi] Remove @Ignore tag in ConfigureWifiEntryFragmentTest" into rvc-dev am: a2a1056dda am: 17962d8186
...
Change-Id: I7071b8d5bc3d1c1ee20b75ac92f12d532e723f14
2020-03-18 05:48:47 +00: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
Eric Sandness
f483084edb
Use ChooseLockGeneric When Started By Admin App am: 7430932305 am: 66df88126f am: e6951038a1 am: f9720237fc
...
Change-Id: Ie0dedea428394e0b9b52584b48ea61671d8e1ef8
2020-03-17 21:12:16 +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
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
4727170883
Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45 am: a4ad8f636a am: af6b6d2276 am: 3f8733ddca
...
Change-Id: I7c78a425f3f16ef8d18a4720ee250f83d299f3ed
2020-03-17 14:14:27 +00:00
Automerger Merge Worker
6cdc5bd287
Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 am: 85b0f5fcd2 am: 4f19e358c8 am: 5826fc7933
...
Change-Id: I79d53f43e9d66a24ad025954b023faa94580abd6
2020-03-17 14:00:52 +00:00
Automerger Merge Worker
af6b6d2276
Merge "Remove the index of the homepage category tiles" into rvc-dev am: 9204d76c45 am: a4ad8f636a
...
Change-Id: I3f07c8c044cfccbdfaf2f4b7f0274bff79a611e4
2020-03-17 13:48:00 +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
Automerger Merge Worker
4f19e358c8
Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a29510 am: 85b0f5fcd2
...
Change-Id: I4fd74c8dba82fb6d92147c6b72bcbbe142704ea1
2020-03-17 13:15:07 +00:00
Yanting Yang
9204d76c45
Merge "Remove the index of the homepage category tiles" into rvc-dev
2020-03-17 13:11:40 +00:00