Commit Graph

59842 Commits

Author SHA1 Message Date
Anna Trostanetski
73fdbebfcc [automerger skipped] Merge "Show only listUIChanges instead of all" am: c305df9450 am: 983158e9ab -s ours
am skip reason: Change-Id I5b461b33484a38d0c6a5b7bf7e928231dd662668 with SHA-1 74117346a6 is in history

Change-Id: I07e913d115710757c59c5fd7ab2a7ee7f59790e9
2020-03-19 18:00:03 +00:00
Anna Trostanetski
983158e9ab Merge "Show only listUIChanges instead of all" am: c305df9450
Change-Id: Ic3c11a30e28d91aebd5b15d6b601f12294a13a8b
2020-03-19 17:51:32 +00:00
Anna Trostanetski
c305df9450 Merge "Show only listUIChanges instead of all" 2020-03-19 17:34:45 +00:00
Bonian Chen
4fb049537d Merge "[Settings] Refactor of ApnSettings" am: afbbde35b6 am: 43d3caa835
Change-Id: I5f31cd12c3819768452c417e062219937a269e8e
2020-03-19 17:24:10 +00:00
Bonian Chen
43d3caa835 Merge "[Settings] Refactor of ApnSettings" am: afbbde35b6
Change-Id: I17c240896ef2d462e938fea88e981e73a4a05db4
2020-03-19 17:06:58 +00:00
Bonian Chen
afbbde35b6 Merge "[Settings] Refactor of ApnSettings" 2020-03-19 16:54:42 +00:00
atrost
77e4f7b3bb Show only listUIChanges instead of all
Use the new method that filters out changes that shouldn't be in the
developer UI.

Exempt-From-Owner-Approval: Roll forward of unchanged reverted change previously approved.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PlatformCompatDashboardTest
Bug: 151299145
Change-Id: I5b461b33484a38d0c6a5b7bf7e928231dd662668
Merged-In: I5b461b33484a38d0c6a5b7bf7e928231dd662668
2020-03-19 16:06:28 +00:00
Anna Trostanetski
ad2cfe0576 Merge "Show only listUIChanges instead of all" into rvc-dev am: 550a0459f2
Change-Id: I7aee0a9989d928d787288603abe5bcc043c648ad
2020-03-19 14:53:50 +00:00
Anna Trostanetski
550a0459f2 Merge "Show only listUIChanges instead of all" into rvc-dev 2020-03-19 14:52:19 +00:00
TreeHugger Robot
f5af9891bd Merge "[5G settings UI] add String for the 5G limited VoLTE dialog" into rvc-dev am: 856079384a
Change-Id: I168ecbd9eea24b556dca1d8fa708631831cc0bab
2020-03-19 09:58:48 +00:00
TreeHugger Robot
856079384a Merge "[5G settings UI] add String for the 5G limited VoLTE dialog" into rvc-dev 2020-03-19 09:43:40 +00:00
atrost
74117346a6 Show only listUIChanges instead of all
Use the new method that filters out changes that shouldn't be in the
developer UI.

Exempt-From-Owner-Approval: Roll forward of unchanged reverted change previously approved.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PlatformCompatDashboardTest
Bug: 151299145
Change-Id: I5b461b33484a38d0c6a5b7bf7e928231dd662668
2020-03-19 09:30:15 +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
TreeHugger Robot
a69c3d9c41 Merge "Tweak string for Display over other apps" into rvc-dev am: f210cf3c44
Change-Id: I562abe2b66d199babf205497158a13ae935f7b06
2020-03-19 07:45:59 +00:00
Lee Chou
fbde0b3b39 Merge "Adds logging to confirm esim deletion feature" into rvc-dev 2020-03-19 07:44:20 +00:00
TreeHugger Robot
f210cf3c44 Merge "Tweak string for Display over other apps" into rvc-dev 2020-03-19 07:26:03 +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
Treehugger Robot
3896ca809a [automerger skipped] Merge "Fix sim pin lock preference disappear in dual sim." am: 2dd19966b7 am: 51c080aaf9 -s ours
am skip reason: Change-Id I91b551bc363b8ecb0a4b6b40e9de79c74ccd76fd with SHA-1 3d54554521 is in history

Change-Id: I4cb5b55932b67330e1d167c80525172f4f86217b
2020-03-19 05:35:12 +00:00
Treehugger Robot
51c080aaf9 Merge "Fix sim pin lock preference disappear in dual sim." am: 2dd19966b7
Change-Id: I11c1999d2ad4502366acf8b29946d4412ed393c2
2020-03-19 05:12:32 +00:00
Tsung-Mao Fang
6f6e6810ae Tweak string for Display over other apps
Fix: 144901996
Test: Visual
Change-Id: I5dacf8146130431624300d04421351a87ebd4d23
2020-03-19 05:04:53 +00:00
Treehugger Robot
2dd19966b7 Merge "Fix sim pin lock preference disappear in dual sim." 2020-03-19 04:57:26 +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
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
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
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
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