PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
71,904 Commits 1 Branch 0 Tags
c38b502c4a2810da500125ce7dd400f9f28a38f5
Commit Graph

71904 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
c38b502c4a Merge "Add OWNER to network/datausage/wifi path" am: 56834d2ce3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635179

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d177c825df890a2d8947173e85ddd401e9f7361
 2021-03-15 11:30:18 +00:00
Treehugger Robot
56834d2ce3 Merge "Add OWNER to network/datausage/wifi path" 2021-03-15 11:02:28 +00:00
Chiachang Wang
201429b683 Merge "Replace the hidden getActiveLinkProperties usage" am: d709b55250 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1635200

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3d7e876c9fb8bf81a300b6b76154672e0d3b04c7
 2021-03-15 10:14:46 +00:00
Chiachang Wang
d709b55250 Merge "Replace the hidden getActiveLinkProperties usage" 2021-03-15 09:42:16 +00:00
Chiachang Wang
fd1fa9c0a8 Replace the hidden getActiveLinkProperties usage 
It's a refactor work to remove the hidden connectivity method
usages outside the incoming connectivity module.

CM#getActiveLinkProperties is hidden and no longer supported
outside the module. Caller should replace it with
CM#getLinkProperties(Network), so replace the usage as it is.

Bug: 172183305
Test: m
Change-Id: I20bcc9da97113da352e43a87d029596c9729cad8
 2021-03-15 09:07:48 +00:00
Betty Chang
ebea5200cb Add OWNER to network/datausage/wifi path 
Change-Id: I30ca24ea0823378d18b39a2eae937378662f6c14
 2021-03-15 06:39:14 +00:00
Treehugger Robot
dac69ccd8f Merge "Update src/com/android/settings/inputmethod/OWNERS" am: e9dff191b0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1624591

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I74024fbb550f8c405f2850bd20b90599370b0bad
 2021-03-11 00:58:01 +00:00
Treehugger Robot
e9dff191b0 Merge "Update src/com/android/settings/inputmethod/OWNERS" 2021-03-10 23:05:57 +00:00
Yohei Yukawa
5878a77218 Update src/com/android/settings/inputmethod/OWNERS 
Let's update this legacy OWNERS file based on the current reality.

Hopefully this would make it easier for contributers to find available
owner reviewers.

Fix: 182385491
Test: n/a
Change-Id: If47b5c0b83d561dceacc58c8fbd3643524432d62
 2021-03-10 10:37:51 -08:00
Zoey Chen
6003cb977f Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" am: 9abf2bff3b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1620520

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98e70590d8d29451f0906f09e3d90e847e74d9f7
 2021-03-09 11:21:49 +00:00
Zoey Chen
9abf2bff3b Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" 2021-03-09 10:35:53 +00:00
Ahaan Ugale
6d5dc7b451 Merge "OWNERS for autofill and assist settings." am: 7af352dc73 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1621607

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba9dab65368e117fded8d1ff93455c274fffcaa0
 2021-03-08 06:31:53 +00:00
Ahaan Ugale
7af352dc73 Merge "OWNERS for autofill and assist settings." 2021-03-08 05:47:48 +00:00
Ahaan Ugale
1014194897 OWNERS for autofill and assist settings. 
tests/unit/../autofill is empty here; new files are being added in the
internal repo.

Change-Id: Ia4aaa395b01147ee0597cca6075aae0121de7dd9
Test: n/a
 2021-03-07 00:40:15 +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
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
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
Zoey Chen
bf1857e4a5 [Telephony] Use TelephonyCallback instead of PhoneStateListener part5 
Since the redesign of PhoneStateListener, use TelephonyCallback to get the callback of EVENT_*

Bug: 167684594
Test: make and atest NetworkProviderWorkerTest
Change-Id: I52af54045872bbf13e64d5d94c8b027ec702abb9
Merged-In: I52af54045872bbf13e64d5d94c8b027ec702abb9
 2021-03-05 11:46:46 +08: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
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
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
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
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
changbetty
2e763e52cf [Testing] Use AndroidJUnit4 instead in MobileNetworkUtilsTest 
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context
3. Change the Copy Right
4. Create the real object for PhoneAccountHandle and ComponentName

Bug: 164989754
Test: atest -c MobileNetworkUtilsTest
Change-Id: I1778832b0602062adb24928343c0c1d0e525942d
Merged-In: I1778832b0602062adb24928343c0c1d0e525942d
 2021-03-03 23:33:00 +08:00
Paul Hu
ddf3efb070 Merge "Update Utils#getTetheringLabel usage on Settings" am: 2b1e3a971f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1601653

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51b526d575a540cfb7ab6cef8be5d096f3660728
 2021-03-03 02:59:37 +00:00
Paul Hu
2b1e3a971f Merge "Update Utils#getTetheringLabel usage on Settings" 2021-03-03 02:15:22 +00:00
Sudheer Shanka
bf29c73cb7 Merge "Update DataSaverBackend to use NetworkPolicyManager.Listener." am: 90f59be59a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1612821

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac6d23d86624419bc716c70a4150090e907928b7
 2021-03-02 23:01:32 +00:00
Sudheer Shanka
90f59be59a Merge "Update DataSaverBackend to use NetworkPolicyManager.Listener." 2021-03-02 21:55:30 +00:00
Treehugger Robot
9059706e7b Merge "Wellbeing Package needs to be enabled by default" am: b6dc427c50 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1587086

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12e20519ac29f802f9983dcf27f313388b33829c
 2021-03-02 19:05:16 +00:00
Sudheer Shanka
0a476f5f53 Update DataSaverBackend to use NetworkPolicyManager.Listener. 
This will avoid having to update this every time we
add a new callback.

Test: treehugger
Change-Id: Ic34e3eac87d207eb2ffff7430fdf3b77871ae812
 2021-03-02 13:05:43 +00:00
Treehugger Robot
b6dc427c50 Merge "Wellbeing Package needs to be enabled by default" 2021-03-02 06:09:37 +00:00
paulhu
2a5051e4fd Update Utils#getTetheringLabel usage on Settings 
Utils#getTetheringLabel() is using TetheringManger to get
tetherable interface. So update the usage on Settings.

Bug: 180693313
Test: atest SettingsRoboTests
Change-Id: I1907743ed13c333ecbafd25b6dd9276fe692f2ea
 2021-03-02 03:57:34 +00:00
Naga Venkata Durga Ashok Mutyala
f76cd69793 Wellbeing Package needs to be enabled by default 
Add the wellbeing application to keepEnabledPackages.
so, it will prevent the users to disable explicitly.

Test: NA
Bug: 180078180
Change-Id: I2645f30fac60106410eaf2126c10d8ab804fd1b7
 2021-02-26 15:09:55 +00:00
Treehugger Robot
08bea2183d Merge "Keystore 2.0: Update credential settings to use public Keystore API." am: 7086917968 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569700

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I31b4a6e88530092dc2849dc4fb7e09c0d5463db3
 2021-02-26 03:55:00 +00:00
Treehugger Robot
7086917968 Merge "Keystore 2.0: Update credential settings to use public Keystore API." 2021-02-26 01:50:16 +00:00