Commit Graph

11667 Commits

Author SHA1 Message Date
Bonian Chen
203f0fe89d [Settings] Code refactor - remove unused import lines
Remove some unused import lines within source code based on
https://source.android.com/setup/contribute/code-style

Bug: 182867979
Test: build pass
Change-Id: I76dbcfa9e5b435b2838401dfee15b12f472d07d0
2021-03-16 10:24:24 +00:00
Zoey Chen
9abf2bff3b Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" 2021-03-09 10:35:53 +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
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
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
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
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
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
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
995581e856 Merge "Replace ConnectivityManager hidden symbols on Settings" am: cbcea32087
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597453

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5fe3e26c5bdda32edf656b4d7e94d2dc17c14e06
2021-02-25 08:19:44 +00:00
Paul Hu
cbcea32087 Merge "Replace ConnectivityManager hidden symbols on Settings" 2021-02-25 07:44:50 +00:00
Treehugger Robot
1d7e8ae790 Merge "Adding notification team members to notification directory" am: f290b00125
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1600634

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba4fb1061bbc4036b3166f8ddc3d9836f10078a1
2021-02-24 04:26:10 +00:00
paulhu
c11ac84929 Replace ConnectivityManager hidden symbols on Settings
Connectivity is becoming a mainline module in S, so
ConnectivityManager hidden symbols can not be used for outside
components. Besides, most Tethering relevant methods or variables
on CM are migrated to TetheringManager. So replace all these
methods or variables from ConnectivityManager to TetheringManager
on Settings.

Bug: 180693313
Test: make RunSettingsRoboTests ROBOTEST_FILTER=<Modified Test>
Change-Id: Iba4b121a4ddf3f04252aa0355e0e6494a593682a
Merged-In: Iba4b121a4ddf3f04252aa0355e0e6494a593682a
2021-02-24 11:45:02 +08:00
Treehugger Robot
c309ada683 Merge "Owners updates" am: 395caa5fa6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1597956

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4e1aff62b059325bf4069f4bbca35b074dabe976
2021-02-24 01:22:19 +00:00
Julia Reynolds
f2a444328c Adding notification team members to notification directory
Change-Id: Ie51b4b4ac69843b3a68957e03462d1b226abbdc0
2021-02-23 18:54:59 +00:00
Xin Li
ad3fa60e26 Merge ab/7061308 into stage.
Bug: 180401296
Merged-In: I35fe00aeeb112d5d9971985619e3ec5095dcdb7b
Change-Id: I07d008e38827280c9e9c6b7fa31393309f9de8a3
2021-02-21 09:25:11 -08:00
Weng Su
880e2ab494 Owners updates
- Add wengsu to network path for provider model feature implementation

- Add wifi/OWNERS to tests/unit/src/com/android/settings/wifi/OWNERS

Bug: 180778022
Test: N/A, just owners update
Change-Id: I9255fb4980dbbe163850be2459528a3380c15d76
2021-02-20 12:58:25 +00:00
Bob Badour
7d8e27cbb5 Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings" 2021-02-18 23:43:49 +00:00
Lorenzo Colitti
65128bab08 Remove ConnectivityManager from EnterprisePrivacyFeatureProvider.
It is only used in GlobalHttpPreferenceController. Move it there.

Bug: 173331190
Test: atest SettingsRoboTests
Change-Id: I62c589679052b276927d057d3d5d084bbfb57626
Merged-In: I62c589679052b276927d057d3d5d084bbfb57626
2021-02-18 23:51:11 +09:00
Lorenzo Colitti
1434c08600 Stop using ConnectivityManager for VPNs.
These methods have all moved to VpnManager.

Bug: 173331190
Test: atest SettingsRoboTests
Change-Id: I1dd57fa2213b1785a94ec9d6ab4cce3a5d2684ff
Merged-In: I1dd57fa2213b1785a94ec9d6ab4cce3a5d2684ff
2021-02-18 23:50:59 +09:00
Bob Badour
6695ff84d9 [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings
Added SPDX-license-identifier-Apache-2.0 to:
  Android.bp
  protos/Android.bp
  tests/anomaly-tester/Android.bp
  tests/perftests/Android.bp
  tests/robotests/Android.bp
  tests/uitests/Android.bp
  tests/unit/Android.bp
  tests/unit/InstrumentedEntitlementApp/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I81f11a66b5977cb5096e262819084706af5fa54c
2021-02-12 17:08:01 -08:00
Abel Tesfaye
2babd2d36a Implemented nearby button that displays wifi sharing intent and long press button that opens wifi qr share fragment
Test: locally with phone
Change-Id: I73663cd3e9e86431a9264925661159fbcd16b9d3
Merged-In: I931aabaada09c87b4a7936bcde4fcff8bc237dd0
2021-02-04 22:07:08 +00:00
Jiun-Yang Hsu
2d0baa2c27 Create folder and OWNERS file for component test
Test: No test needed for creating folder and OWNERS
Change-Id: I6b1aff581df36a9c70309df2f2ce30d547a820d5
2021-01-29 09:01:30 +00:00
Benjamin Franz
92480fc15d Update constructor usage for CompatibilityChangeInfo
As we're introducing an overridable flag on CompatibilityChangeInfo, the
constructor takes an additional argument that needs to be reflected in
these tests.

Bug: 174043039
Test: atest SettingsRoboTests
Change-Id: Ib5528ded408cb7807e2e3a90e1f99ee1775d566d
2021-01-06 15:12:50 +00:00
Allen Su
034b2236dd Merge "Change carrier config" am: ba38382627 am: 3d9ede1815
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1512649

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I521b6e79f50ac9b7a6b5ecb72a6e4d8ad0a580dc
2020-12-22 01:35:07 +00:00
Allen Su
ba38382627 Merge "Change carrier config" 2020-12-22 00:26:52 +00:00
Bonian Chen
bb5688ea22 Merge changes from topic "eSIM with same group UUID" into rvc-qpr-dev am: 0968b8603e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13241064

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I104ea3e6ace5e0d3fbe80d62e835d2fa986b852b
2020-12-17 15:52:05 +00:00
Bonian Chen
4ea9c2d6a5 [Settings] Only display 1 SIM UI when multiple with same group UUID am: 150eb72a81
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13209427

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide453d4b8f1a2b40057804fa1bb47705c05dbf86
2020-12-17 15:52:03 +00:00
Bonian Chen
0968b8603e Merge changes from topic "eSIM with same group UUID" into rvc-qpr-dev
* changes:
  [Settings] code refactor - rename isSubscriptionCanBeDisplayed
  [Settings] Only display 1 SIM UI when multiple with same group UUID
2020-12-17 15:27:46 +00:00
Jeremy Goldman
e6765a0dc8 Merge "Owners updates" am: 59465ee9d3 am: 2b1b458f1a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1531440

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I308590ad0678932d17660264de8f7a81918bd371
2020-12-17 13:16:21 +00:00
Jeremy Goldman
59465ee9d3 Merge "Owners updates" 2020-12-17 12:24:01 +00:00
Bonian Chen
c2232020c4 [Settings] code refactor - rename isSubscriptionCanBeDisplayed
canSubscriptionBeDisplayed is more readable.

Reasonale:
When cherry-picking ag/12886476 into Android R branch (ag/13209427), a comment from code reviewer suggested this change.
Since ag/12886476 has been merged for a while, another patch for it is perferred option when comparing with reverting that CL and resubmit it.

Bug: 175830728
Change-Id: Ie91eb82504fd7cff6671803a2bc2560139690952
Test: build pass
Merged-In: Ie91eb82504fd7cff6671803a2bc2560139690952
2020-12-17 03:04:50 +00:00
Bonian Chen
150eb72a81 [Settings] Only display 1 SIM UI when multiple with same group UUID
Some carrier(s) expand their service through providing eSIM in companion
with pSIM. Group UUID is designed to group them together as a single
SIM.

Bug: 169455114
Bug: 175069803
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SubscriptionsPreferenceControllerTest
Change-Id: I0934a45a2917ab106627c733162efbee9a13f216
(cherry picked from commit a6b249d625)
Merged-In: I0934a45a2917ab106627c733162efbee9a13f216
2020-12-17 02:12:44 +00:00
Xiangyu/Malcolm Chen
48bd757fac Merge "Automatically dismiss SIM combination warnings and selection dialogs." am: 33657f8d44 am: 04d95b6e8e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1531286

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd0289d605724fd55adc9a5f37c7555e150efa85
2020-12-16 20:05:15 +00:00
Jeremy Goldman
6efeeaafec Owners updates
Add goldmanj to tests/unit for junit migration and
utility library creation
Add connectivity settings eng to settings/datausage.

Test: N/A, just owners update
Change-Id: I182ad6093677dc151b171d9e5aaa15cdd353c474
2020-12-16 10:40:49 +00:00
Malcolm Chen
1305cee98e Automatically dismiss SIM combination warnings and selection dialogs.
When configuring CBRS profiles this dialog / notification will be
dismissed after configuration is done, to avoid confusion.

Bug: 142092510
Test: manual and unittest
Change-Id: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
Merged-In: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
2020-12-15 16:45:27 -08:00
Malcolm Chen
abd767ab1d Automatically dismiss SIM combination warnings and selection dialogs.
When configuring CBRS profiles this dialog / notification will be
dismissed after configuration is done, to avoid confusion.

Bug: 142092510
Test: manual and unittest
Change-Id: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
Merged-In: Iaf30062f555ec2c119c4aafd6aa013e73b5253f0
2020-12-15 22:11:55 +00:00
Hugh Chen
416110bac0 Add condition to check case of accessory combinations am: b767df1a08
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13218259

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a4502e3568d0049c4fff7f730b42d1bc975cea4
2020-12-15 05:01:42 +00:00
Hugh Chen
c61ec502f5 Do nothing when choosing file transfer when in accessory mode am: e8dc7bc283
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13218257

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3bd051363458a75a0dd190f41b0cf2901e3bf680
2020-12-15 05:01:34 +00:00
Hugh Chen
2676dd763c Fix the usb menu didn't switch to "File Transfer/Android Auto" right after connecting to the car unit. am: 91ed63124c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13218253

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ca5a04cc2e8db3b2f50d1656fa54c8e02f8e394
2020-12-15 05:01:25 +00:00
Diego Vela
25ee8c7cf0 Merge "Revert^2 "Add <uses-library> information."" am: a2e406ed85 am: 8403231bbb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1526684

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9a772056ff7f76d79e2f4864e0e796b5fddc1a27
2020-12-14 22:38:33 +00:00
Diego Vela
acba236677 Merge "Revert "Add <uses-library> information."" am: 54b741096b am: 9d61c8a23d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1527773

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04da28694d92bf00afee8eec26f6cf9dc63e13a4
2020-12-14 22:25:47 +00:00
Diego Vela
a2e406ed85 Merge "Revert^2 "Add <uses-library> information."" 2020-12-14 22:09:58 +00:00
Diego Vela
1ef19adf52 Revert^2 "Add <uses-library> information."
7f1950928f

Change-Id: I8d3d6fee8e5a2b6eb337abb53f21b9b909b007c9
2020-12-14 22:05:04 +00:00
Diego Vela
54b741096b Merge "Revert "Add <uses-library> information."" 2020-12-14 21:49:14 +00:00