Commit Graph

72054 Commits

Author SHA1 Message Date
Weng Su
354bdce86b [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours am: 385b5cafd2 -s ours am: 8aa56318f8 -s ours am: 1f234b3791 -s ours
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448946

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib60fc2fd5e2e16815f0aa60e6b542867855f2996
2021-03-05 20:54:51 +00:00
Weng Su
1f234b3791 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours am: 385b5cafd2 -s ours am: 8aa56318f8 -s ours
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448946

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic08627d137adc378004da05adf8945c9f7b38b0a
2021-03-05 20:14:51 +00:00
Weng Su
8aa56318f8 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours am: 385b5cafd2 -s ours
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448946

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7896b97e36005b6f3b28f448a2e2ede6d373259f
2021-03-05 19:39:23 +00:00
Weng Su
385b5cafd2 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 faa5f6b5f6 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448946

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ae7ce98bd42db5528d78be0e8a72b86a5de9ee9
2021-03-05 18:44:22 +00:00
Weng Su
efb2543e93 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 faa5f6b5f6 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448946

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d012e372d801b90f303a5138eed04d13dd1300a
2021-03-05 18:12:04 +00:00
Weng Su
5fe3617755 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6 -s ours am: 9da6b6f4ae -s ours am: b2af05bf21 -s ours am: 0dfeac5326 -s ours
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448945

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd1840366161db05f9ca1c772ea2b2b866fb4efa
2021-03-05 06:15:42 +00:00
Weng Su
0dfeac5326 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6 -s ours am: 9da6b6f4ae -s ours am: b2af05bf21 -s ours
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448945

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6fd81b8b5e62d1814025fde12010f158268cac8
2021-03-05 05:54:38 +00:00
Janis Danisevskis
bb5ebce8a0 Merge "Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0" am: 3c7b085331 am: bae6535b75
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569702

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4395ebf453fd712d9870580a90c370b42a770d7a
2021-03-05 05:41:50 +00:00
SongFerng Wang
cc1715e2c0 Merge "Replace allowedNetworkTypes with allowedNetworkTypesForReason" am: 6775f40664 am: 29594edb70
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614990

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8cde83c4699a3859c3a0748688ab0c0dc0fd5a04
2021-03-05 05:17:42 +00:00
Janis Danisevskis
bae6535b75 Merge "Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0" am: 3c7b085331
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569702

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f252dc43dfc8494e7cceb3b559b7252cd99697c
2021-03-05 05:17:11 +00:00
Treehugger Robot
2b35467feb [automerger skipped] Merge "Keystore 2.0: Update Wifi settings to use mostly public keystore API." am: 32d2075fa3 am: c4f1bd9675 -s ours
am skip reason: Change-Id Ib794c5f2d904c2b187d7d5fd00b81afc852d0052 with SHA-1 2c74864579 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569701

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e09bb1966a414fa31fe3de39be2b945d7e39722
2021-03-05 05:11:51 +00:00
Weng Su
b2af05bf21 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6 -s ours am: 9da6b6f4ae -s ours
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448945

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I909b96de08c455dd659c8cf9fbf19f52722622e7
2021-03-05 05:07:57 +00:00
SongFerng Wang
29594edb70 Merge "Replace allowedNetworkTypes with allowedNetworkTypesForReason" am: 6775f40664
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614990

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb1dc1653e5d33d4f21760aabb203cf40adcbdba
2021-03-05 05:00:14 +00:00
TreeHugger Robot
82d0f7a11b [automerger skipped] Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-dev am: e0a922612f -s ours am: 0d290a85c7 -s ours
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 05d6fa9bcb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432624

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9490d4938e188774ad9700518fe7e2ec61b6889
2021-03-05 04:47:22 +00:00
Treehugger Robot
c4f1bd9675 Merge "Keystore 2.0: Update Wifi settings to use mostly public keystore API." am: 32d2075fa3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569701

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0873d00dc15ffae3ac08ada37986a724bf825780
2021-03-05 04:26:16 +00:00
TreeHugger Robot
0d290a85c7 [automerger skipped] Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-dev am: e0a922612f -s ours
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 05d6fa9bcb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13432624

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I052bc73db19c56eff3cfa7dec4453595c4fe29d3
2021-03-05 04:26:00 +00:00
Weng Su
c271a656a7 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 05d6fa9bcb am: f71502fb10 -s ours am: 739bf235e5 -s ours
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 eaeb50271e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13468308

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6e308309d136e18ecfe56f17e4379504197676c
2021-03-05 04:25:55 +00:00
Weng Su
739bf235e5 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 05d6fa9bcb am: f71502fb10 -s ours
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 eaeb50271e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13468308

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie75ab656ae36f2960b84784c48c82ae640e933a6
2021-03-05 04:25:30 +00:00
tim peng
cd4df5a1d3 Merge "Add the explicitly mutable flag for creating a PendingIntent in MediaOutputSlice" into rvc-qpr-dev am: d082221652
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13241059

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia9a1679a3b154e0aba27a01d1ad42f407e3d58a4
2021-03-05 04:25:29 +00:00
Weng Su
9da6b6f4ae [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6 -s ours
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 05d6fa9bcb is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13448945

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I120f48d18c1591b5d1e1b1182e4ce06d9babbb7a
2021-03-05 04:24:50 +00:00
Janis Danisevskis
3c7b085331 Merge "Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0" 2021-03-05 02:57:34 +00:00
tim peng
d082221652 Merge "Add the explicitly mutable flag for creating a PendingIntent in MediaOutputSlice" into rvc-qpr-dev 2021-03-05 02:03:05 +00:00
SongFerng Wang
6775f40664 Merge "Replace allowedNetworkTypes with allowedNetworkTypesForReason" 2021-03-05 01:59:53 +00:00
Treehugger Robot
32d2075fa3 Merge "Keystore 2.0: Update Wifi settings to use mostly public keystore API." 2021-03-05 00:02:28 +00:00
TreeHugger Robot
e0a922612f Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-dev 2021-03-04 23:48:51 +00:00
Weng Su
f71502fb10 [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 05d6fa9bcb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13468308

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I578a0db27ddf400017d53edadcb13938f398210b
2021-03-04 23:05:59 +00:00
SongFerng Wang
1cb02f5e0d Merge changes Ia99a4cf4,Ib31e23b8 am: 191136002b am: d5ff766ed8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1618689

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I298f46dd7e44e63141b91ccdd67ea7ebbefc9015
2021-03-04 13:45:19 +00:00
SongFerngWang
959454f32a Use SubscriptionManager.getResourcesForSubId to get Resources am: 766f78e8ed am: 18c15a2545
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1618688

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2de84a9f2ee32569f71fd46fc87a448237147d02
2021-03-04 13:45:18 +00:00
SongFerng Wang
d5ff766ed8 Merge changes Ia99a4cf4,Ib31e23b8 am: 191136002b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1618689

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ife74a181399e5c10866b92663f56a2e0077bc9c4
2021-03-04 13:11:01 +00:00
SongFerngWang
18c15a2545 Use SubscriptionManager.getResourcesForSubId to get Resources am: 766f78e8ed
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1618688

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0892ae8b68eff489e2274aad56588d3c918a369e
2021-03-04 13:10:46 +00:00
SongFerngWang
fc435e3736 Replace allowedNetworkTypes with allowedNetworkTypesForReason
- Replace getAllowedNetworkTypes with
getallowedNetworkTypesForReason(ALLOWED_NETWORK_TYPES_REASON_CARRIER)
- Replace "Settings.Global.PREFERRED_NETWORK_MODE" with
"getAllowedNetworkTypesForReason(USER)"
- Move EnabledNetworkModePreferenceControllerTest from robotests to unit
- Replace KEY_NR_ENABLED_BOOL with KEY_CARRIER_NR_AVAILABILITY_INT
- Rename PreferredNetworkModeContentObserver to AllowedNetworkTypesListener
Bug: 161434786
Test: build pass.
(PASS)atest CdmaSystemSelectPreferenceControllerTest
(PASS)atest PreferredNetworkModePreferenceControllerTest
(PASS)atest AllowedNetworkTypesListenerTest
(PASS)atest EnabledNetworkModePreferenceControllerTest
(PASS)atest MobileNetworkUtilsTest

Change-Id: I2b981569ad11cf70a558c1952cc2e077464328d8
Merged-In: I2b981569ad11cf70a558c1952cc2e077464328d8
2021-03-04 19:20:04 +08:00
SongFerng Wang
191136002b Merge changes Ia99a4cf4,Ib31e23b8
* changes:
  [Testcase] To migration DisabledSubscriptionControllerTest
  Use SubscriptionManager.getResourcesForSubId to get Resources
2021-03-04 11:13:08 +00:00
SongFerngWang
1ffba4af4e [Testcase] To migration DisabledSubscriptionControllerTest
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment
   to get context
3. Change Copy Right
4. remove the mock of PreferenceScreen

Bug: 173003522
Test: atest DisabledSubscriptionControllerTest.java
Change-Id: Ia99a4cf4618fcb32162485e7da5e48e3b313ce67
Merged-In: Ia99a4cf4618fcb32162485e7da5e48e3b313ce67
2021-03-04 09:41:56 +00:00
SongFerngWang
766f78e8ed Use SubscriptionManager.getResourcesForSubId to get Resources
To support multi-SIM card case. The code uses the
SubscriptionManager.getResourcesForSubId to get Resources.

Bug: 171843666
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest

Change-Id: Ib31e23b81bdbd3b5336b45fc73994f40d021718b
Merged-In: Ib31e23b81bdbd3b5336b45fc73994f40d021718b
2021-03-04 09:41:31 +00:00
SongFerng Wang
a0a079ed11 Merge changes I89162011,I110727b6,I1778832b am: cbc2c4f102 am: fa58b7e292
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614988

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68dd01db1ee41b4baf09338872edc8599d892f96
2021-03-04 07:41:45 +00:00
changbetty
44812e5f61 [Testing] Use AndroidJUnit4 instead in telephony/cdma/ test files am: fbb61ba4d0 am: d64a350d86
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7cde36e5bc7ca5b0899915eaaaf04c0dd974f22
2021-03-04 07:41:43 +00:00
changbetty
f0ea678e15 [Testing] Use AndroidJUnit4 instead in MobileNetworkUtilsTest am: 2e763e52cf am: fec00ac4b7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614986

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I280b6ed2f09e4c040c4563582cee05c3a03c66bc
2021-03-04 07:41:09 +00:00
SongFerng Wang
fa58b7e292 Merge changes I89162011,I110727b6,I1778832b am: cbc2c4f102
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614988

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id800c96a0c41593b68d1718e0eb3b11eaf05538e
2021-03-04 06:48:24 +00:00
changbetty
d64a350d86 [Testing] Use AndroidJUnit4 instead in telephony/cdma/ test files am: fbb61ba4d0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614987

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id43b7eb15d35bc2c3730b3118d399c8d4f66424f
2021-03-04 06:48:18 +00:00
changbetty
fec00ac4b7 [Testing] Use AndroidJUnit4 instead in MobileNetworkUtilsTest am: 2e763e52cf
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614986

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d5ff0ee3f8af2de5387d61094be0d9f3c35ce6b
2021-03-04 06:48:02 +00:00
Janis Danisevskis
146a0dab01 Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0
Keystore 2.0 no longer stores vpn profiles. It still offers a
Legacy VPN profile store, to access existing profiles.

Test: N/A
Bug: 171305607
Bug: 171305388
Merged-In: I40dea0b9c3824b56814ae4c2fb6c7663c7d97af5
Change-Id: I40dea0b9c3824b56814ae4c2fb6c7663c7d97af5
2021-03-03 22:30:48 -08:00
Janis Danisevskis
e92bcb3287 Keystore 2.0: Update Wifi settings to use mostly public keystore API.
Test: N/A
Bug: 171305607
Bug: 171305388
Merged-In: Ib794c5f2d904c2b187d7d5fd00b81afc852d0052
Change-Id: Ib794c5f2d904c2b187d7d5fd00b81afc852d0052
2021-03-03 22:30:35 -08:00
SongFerng Wang
cbc2c4f102 Merge changes I89162011,I110727b6,I1778832b
* changes:
  Settings JUnit test for PreferredNetworkModeContentObserverTest
  [Testing] Use AndroidJUnit4 instead in telephony/cdma/ test files
  [Testing] Use AndroidJUnit4 instead in MobileNetworkUtilsTest
2021-03-04 06:17:31 +00:00
Janis Danisevskis
f33b7dd3cc Merge "Keystore 2.0: Update Wifi settings to use mostly public keystore API." into rvc-qpr-dev-plus-aosp 2021-03-04 05:33:21 +00:00
Xin Li
69d7e7f3c4 [automerger skipped] Merge "Merge RQ2A.210305.007" am: 6b94f5ac81 -s ours am: 60b92f8e94 -s ours
am skip reason: Change-Id I12e20519ac29f802f9983dcf27f313388b33829c with SHA-1 9059706e7b is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1613686

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic2edcb96daa60890af923f429ebdf72de2e15eaa
2021-03-03 23:37:01 +00:00
Xin Li
60b92f8e94 [automerger skipped] Merge "Merge RQ2A.210305.007" am: 6b94f5ac81 -s ours
am skip reason: Change-Id I12e20519ac29f802f9983dcf27f313388b33829c with SHA-1 9059706e7b is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1613686

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0345dadeff9da4646a382bee8f083233e2c4a55c
2021-03-03 22:28:38 +00:00
Xin Li
6b94f5ac81 Merge "Merge RQ2A.210305.007" 2021-03-03 21:41:36 +00:00
Xin Li
2aa4fea82d Merge RQ2A.210305.007
Bug: 180401296
Merged-In: I12e20519ac29f802f9983dcf27f313388b33829c
Change-Id: I8ca0bb7173f6abe08596422b281f6913b66ab9b7
2021-03-03 09:12:21 -08:00
Jeremy Goldman
3611c3e22f Settings JUnit test for PreferredNetworkModeContentObserverTest
Biggest difference here: the use of a MockContentProvider

Bug: 175389659
Test: atest -c PreferredNetworkModeContentObserverTest
Change-Id: I891620118f7e84aa1c7f9e0ccdaeb21a225dc31a
Merged-In: I891620118f7e84aa1c7f9e0ccdaeb21a225dc31a
2021-03-03 23:39:07 +08:00
changbetty
fbb61ba4d0 [Testing] Use AndroidJUnit4 instead in telephony/cdma/ test files
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context
3. Change Copy Right
4. To get the original value and add @After to restore the data

Bug:
Test: atest -c CdmaListPreferenceTest
      atest -c CdmaSubscriptionPreferenceControllerTest
      atest -c CdmaSystemSelectPreferenceControllerTest
Change-Id: I110727b643a6755ee888708bd1fb2a39cf524a2d
Merged-In: I110727b643a6755ee888708bd1fb2a39cf524a2d
2021-03-03 23:35:43 +08:00