PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64,628 Commits 1 Branch 0 Tags
48a84d855f7e81f70b02a760f365a96d28d7d645
Commit Graph

64628 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
48a84d855f Merge mainline-release 6664920 to master - DO NOT MERGE 
Merged-In: Ifa4dc400eb8c87c2514a3629288657520476fbfd
Change-Id: Ib4c9dcb035b9b3e6168309d6d85a310c10e987af
 2020-09-17 21:57:11 -07:00
Bonian Chen
f5fa52884b Merge "[Testing] Remove Robolectric import and use AndroidJUnit4 instead in MobileDataEnabledListenerTest" 2020-09-15 07:09:12 +00:00
changbetty
8de635ea7b [Testing] Remove Robolectric import and use AndroidJUnit4 instead in MobileDataEnabledListenerTest 
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context

Bug: 162048313
Test: atest -c MobileDataEnabledListenerTest
Merged-In: I81b3d6ac075666a45649c8d811832a40bdb1b41b
Change-Id: I34687eb69ef62cd3b6ea6519cee608a7b95f242b
 2020-09-15 12:24:10 +08:00
Treehugger Robot
56349f714d Merge "Add goldmanj to settings owners files." 2020-09-12 00:24:02 +00:00
Jeremy Goldman
9e1e47fef7 Add goldmanj to settings owners files. 
Test: N/A, code not edited.
Change-Id: I23a64e52d01ebeda1509d1e207200d868444d955
 2020-09-11 18:55:46 +00:00
Bonian Chen
11db11d236 Merge "Fix NullPointerException, TelephonyManager.getServiceState is null" 2020-09-11 06:46:58 +00:00
Bonian Chen
b3efa585f2 Merge "[Settings] subscription UI should be closed when SIM is removed" 2020-09-11 06:46:36 +00:00
SongFerngWang
0c2cabef6e Fix NullPointerException, TelephonyManager.getServiceState is null 
Add the null protect for TelephonyManager.getServiceState.

Bug: 166676020
Test: 1. make RunSettingsRoboTests ROBOTEST_FILTER=\
RenameMobileNetworkDialogFragmentTest (PASS)
2. make RunSettingsRoboTests ROBOTEST_FILTER=\
AutoSelectPreferenceControllerTest (PASS)
3. make RunSettingsRoboTests ROBOTEST_FILTER=\
PreferredNetworkModePreferenceControllerTest (PASS)
4. make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest (PASS)

Merged-In: I61e59f7ba9d6c64019d620d6cb80099ded41473f
Change-Id: Ib80e5e7498a078435185814d11c3b2bcc4318f59
 2020-09-11 09:27:41 +08:00
Bonian Chen
22a70a5e15 [Settings] subscription UI should be closed when SIM is removed 
When SIM is removed, subscription UI should actively be closed (instead of
waiting for user to leave UI).

Bug: 160197149
Test: manual
Merged-In: I2854147c956faa633a9682eee0028db6cd2d3912
Change-Id: I920b88879a225f1d6ce696c7784d1f6f279c16d9
 2020-09-11 09:18:34 +08:00
Xin Li
36cfa7db8e Merge "Merge Android R" 2020-09-10 17:21:53 +00:00
Xin Li
f82ee6a5d3 Merge Android R 
Bug: 168057903
Merged-In: I7972af3db5cb995b4a7c4deb982eeef6c3dddaad
Change-Id: I2e7fc7920cde49624ad7bd4053d33fd36d49e809
 2020-09-08 16:56:07 -07:00
Treehugger Robot
ada75ad54d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 681beda2f8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7972af3db5cb995b4a7c4deb982eeef6c3dddaad
 2020-09-05 18:44:03 +00:00
Treehugger Robot
681beda2f8 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-05 18:32:54 +00:00
Treehugger Robot
0749b2e5b1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e30450cd68 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4918d11aef9655cc94daaefdbc2c6400823beaa9
 2020-09-05 14:26:56 +00:00
Treehugger Robot
a4bfe8a50f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 992e9bc161 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib43bd3e6188189f638e1c583907708eeb270f5df
 2020-09-05 14:26:49 +00:00
Treehugger Robot
809f01fc74 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 88fe7c9897 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2087ff5e1201a5024e7f6948976e073e1f68312f
 2020-09-05 14:26:25 +00:00
Treehugger Robot
e30450cd68 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-05 13:55:03 +00:00
Treehugger Robot
992e9bc161 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-05 13:53:33 +00:00
Treehugger Robot
88fe7c9897 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-05 13:51:43 +00:00
Bill Yi
af59e5d24f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8a59656075c476e775ad386c0f6169b565ad3586
 2020-09-05 13:15:50 +00:00
Bill Yi
821f954a9a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie0ee665d6f119236268486b2d199de22463bd29d
 2020-09-05 12:40:07 +00:00
Bill Yi
7cd983aed7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9421d2ca455dff9dcd838d2e5b232b29e5498a0f
 2020-09-05 02:10:54 -07:00
Bill Yi
47a48929ac Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If4262b66f910ae9cff97a30a89b354938d787805
 2020-09-05 01:26:27 -07:00
TreeHugger Robot
11304fb8a3 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-09-02 17:50:47 +00:00
TreeHugger Robot
74ab66f631 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-09-02 16:31:43 +00:00
TreeHugger Robot
11fd725f1a Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2020-09-02 16:06:50 +00:00
Anton Hansson
0e5e0c77d4 Add explicit dep on framework-wifi.impl 
android_robolectric_test is having some implicit deps removed
from it, so add in what we depend on directly.

Bug: 157451444
Bug: 161767237
Bug: 167568930
Test: m RunSettingsRoboTests
Exempt-From-Owner-Approval:‌ ‌Cherry-pick
Merged-In: I847cbeaab7aab6e3cb109df7cafd8a63d63c6acb
Change-Id: I847cbeaab7aab6e3cb109df7cafd8a63d63c6acb
 2020-09-02 15:41:40 +00:00
Bill Yi
b9ff4275f3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I01190d1453f17ee5a42b303cfd201a4a8ed5a458
 2020-09-02 13:28:38 +00:00
Bill Yi
25e90ee101 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6efada3aedd313f97b1405db8164499180316b89
 2020-09-02 12:53:56 +00:00
Bill Yi
0009d56501 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I412e0c9881bc5de07ce964b2dc8892bb3e23db60
 2020-09-02 12:17:48 +00:00
Treehugger Robot
b372e3fbcf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 76947837c5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I94bcd92bbc7c3476585bad6fc1334130dcebae56
 2020-09-02 07:11:35 +00:00
Treehugger Robot
f3ae142f67 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 22a9ba1458 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I41cca1a0a56dc19ae68b420aadc78e3cfc3121c9
 2020-09-02 07:11:06 +00:00
Treehugger Robot
76947837c5 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-02 06:35:32 +00:00
Treehugger Robot
22a9ba1458 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-02 06:30:33 +00:00
Bill Yi
7ec0bc9bef Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I43aa317e93b4ee5e484314bf40cdbc2e5e4aa442
 2020-09-02 05:42:17 +00:00
Bill Yi
256ea9e29b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I15697e753d245ca812bd2cba4d174c54811bde91
 2020-09-02 05:05:27 +00:00
Xin Li
d57e13f558 Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master 2020-09-01 20:04:34 +00:00
SongFerng Wang
318f6bcc53 Merge "Add NR network type to "Global" mode preference" am: 19222f2154 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1395568

Change-Id: I1714b765690ac43e77233752d31ef921219584f0
 2020-09-01 04:27:11 +00:00
SongFerng Wang
19222f2154 Merge "Add NR network type to "Global" mode preference" 2020-09-01 04:09:35 +00:00
Xin Li
748efff856 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) 
Bug: 166295507
Merged-In: Ie9d2c4d6d4618a167af1c5627d5d7918a404f398
Change-Id: I2ae428e37fd96226ce4e06032e2c0beaacbd0301
 2020-08-28 23:35:54 -07:00
Avinash Nalluri
e4956322e8 Add NR network type to "Global" mode preference 
Change-Id: I3b9ce75eb37a5002f7a77561c987c6758baf139b
Bug: 163382085
 2020-08-27 15:56:13 -07:00
Treehugger Robot
e40251b9f5 Merge "Settings: Fix exception in about phone during SIM swap" am: 16503cf517 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344083

Change-Id: Iad9e0eb16478e12ff2e5340c34bb8cc4ba5ece3e
 2020-08-19 14:56:13 +00:00
Treehugger Robot
16503cf517 Merge "Settings: Fix exception in about phone during SIM swap" 2020-08-19 14:47:21 +00:00
hoffc
291fd9b816 Settings: Fix exception in about phone during SIM swap 
In about phone SIM status dialog fragment does not correctly remove the subscription change listener and broadcast receiver during SIM swap, which results in IllegalStateException force close and memroy leak.

Make sure to remove sub change listener and un-register broadcast receiver in SIM swap case.

Bug: 159410236

Change-Id: I7867852c58b2b38e0afc73422b7d616aa305199c
 2020-08-18 13:57:55 +08:00
Bonian Chen
af57413abc Merge "[Settings] Grant permissions to submit junit test" am: 33e4971820 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398398

Change-Id: I5617a1d70e38aa39ec37ace07bce0d5fda699729
 2020-08-14 08:05:12 +00:00
Bonian Chen
33e4971820 Merge "[Settings] Grant permissions to submit junit test" 2020-08-14 07:45:50 +00:00
Bonian Chen
1c97e70641 [Settings] Grant permissions to submit junit test 
Grant permissions for adding new Junit test case.

Change-Id: Iabde2307669815fd50cdba241492c82b9e2cf64d
 2020-08-13 18:49:31 +08:00
Jackal Guo
e8b8d9917a Merge "Revert "[Settings] Refactor PhoneStateListener"" am: d7f05b5438 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398396

Change-Id: I7fc418fd2abb11be330b2b7f2139d5d44307b3d1
 2020-08-13 08:56:03 +00:00
Bonian Chen
4fc5e348bf Merge "[Settings] Refactor PhoneStateListener" am: 7903cf872e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398391

Change-Id: Icf8d0db6ffb41041652ae27f0573da2f118465c3
 2020-08-13 08:55:56 +00:00
Jackal Guo
d7f05b5438 Merge "Revert "[Settings] Refactor PhoneStateListener"" 2020-08-13 08:52:47 +00:00