Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
133,717 Commits 1 Branch 0 Tags
4f32231cdaabd451eea3a8f4bee0de4c950217a4
Commit Graph

2790 Commits

Author SHA1 Message Date
SongFerng Wang
4f32231cda Merge "The 2G enable's summary shows the sim card name" into udc-qpr-dev am: 9265db6557 am: e527493354 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24342218

Change-Id: Ie234d3200f8adf08ed3022a7c08644f019a7bd60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-10 06:30:37 +00:00
SongFerng Wang
e527493354 Merge "The 2G enable's summary shows the sim card name" into udc-qpr-dev am: 9265db6557 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24342218

Change-Id: I34d588990a5357a05f636a583361a608b4b28976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-10 05:43:51 +00:00
SongFerng Wang
06a37cda0b The 2G enable's summary shows the sim card name 
The 2G enable's summary should show the sim card name, not the name of service provider.

Bug: 293715485
Test: build pass

Change-Id: Iead9c4e82cd4bf26451e38ded7cbcd276e9fa5f2
 2023-08-08 09:16:16 +00:00
Chaohui Wang
8e2ae547d6 Clean up FeatureFactory.getFeature() 
Bug: 286764889
Test: m Settings
Change-Id: I7e472e6b0ca6b7a735c1b92742ddf06c545176fc
 2023-08-08 08:41:48 +00:00
Chaohui Wang
2541381259 Fix references to resources for Settings 
Bug: 293810334
Test: m Settings
Change-Id: Ie140278f492ef7e1c062ec1ecae2866c521a86aa
 2023-08-08 01:56:05 +00:00
Chaohui Wang
79a978989f Revert^2 "Clean up unused WifiManager.ActionListener" 
This reverts commit c4a0abef8c.

Reason for revert: The original is not the root cause.
Root cause is b/294378814

Change-Id: Ib44ad912073b0f1b06c7ef6b6b998581eef65784
 2023-08-07 04:22:56 +00:00
Martin Stjernholm
c4a0abef8c Revert "Clean up unused WifiManager.ActionListener" 
This reverts commit a2adee5362.

Reason for revert: Breaks build - b/294364808

Change-Id: I4f323c2fc43dddbf2f2dd0e323f026727263c99e
 2023-08-03 13:46:27 +00:00
Chaohui Wang
a2adee5362 Clean up unused WifiManager.ActionListener 
Bug: 285231003
Test: m Settings
Change-Id: I84ec6a76e486df207140c0f5cbda1c6727fe4989
 2023-08-02 15:08:04 +08:00
Treehugger Robot
6bcb048b13 Merge "Match APN types with ignoring the case" into main am: 720fd136ed am: 9a44907d9e am: 3d47657593 am: ff78df4b72 am: 4405824d2c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2671056

Change-Id: I0fc8f2564d064eb4af752d0414ca5437e28ad1fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 08:28:01 +00:00
Treehugger Robot
4405824d2c Merge "Match APN types with ignoring the case" into main am: 720fd136ed am: 9a44907d9e am: 3d47657593 am: ff78df4b72 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2671056

Change-Id: Ibd736933f8d0aa649930a1d432611b958d09f292
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 07:19:20 +00:00
Treehugger Robot
ff78df4b72 Merge "Match APN types with ignoring the case" into main am: 720fd136ed am: 9a44907d9e am: 3d47657593 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2671056

Change-Id: Ie247ffcc6ec787912e50474ec1d51744e6dfc5ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 06:38:47 +00:00
Treehugger Robot
3d47657593 Merge "Match APN types with ignoring the case" into main am: 720fd136ed am: 9a44907d9e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2671056

Change-Id: If5c4c47dd5d1b05635e8d5102e52a58f5442a9da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 05:31:45 +00:00
Treehugger Robot
aefd2d6f36 Merge "Restrict ApnEditor settings" into udc-dev am: 64c88a192a am: 57b00e28ea am: 8d6ff6d1b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982512

Change-Id: I03a3f349f725e6a6abdf53862400a42f39cb54e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-25 22:33:11 +00:00
Treehugger Robot
8d6ff6d1b6 Merge "Restrict ApnEditor settings" into udc-dev am: 64c88a192a am: 57b00e28ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982512

Change-Id: I7d8a257424acaf097339b062621eb85c515ae408
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-25 21:52:38 +00:00
Treehugger Robot
731c2462bc Merge "Restrict ApnEditor settings" into udc-dev am: 64c88a192a am: 57b00e28ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982512

Change-Id: I699b21dd28e73c18945b4fecc6f3318b1cded128
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-25 21:49:30 +00:00
Treehugger Robot
b48dfbbe86 Merge "Restrict ApnEditor settings" into udc-dev am: 64c88a192a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982512

Change-Id: Ia55ca6e477494e1e0ca3773c7a4df63ca2d59d40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-25 21:04:58 +00:00
Treehugger Robot
57b00e28ea Merge "Restrict ApnEditor settings" into udc-dev am: 64c88a192a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982512

Change-Id: Ic052e568818d4829fe40250e00679742fc816263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-25 20:59:46 +00:00
Hideki Ishii
8bce735fa0 Match APN types with ignoring the case 
Currently APN types which are set on ApnEditor are compared with the
types which are configured with read_only_apn_types_string_array in a
case-sensitive manner. So upper case types such as "DUN" or "IMS" can be
set if read_only_apn_types_string_array is configured as "dun" or "ims."
Then the APN with types such as "DUN" or "IMS" can be added and may be
used for the network connection unintentionally.

This patch compares APN types with ignoring the case on ApnEditor to
prevent the problem above.

Bug: 200194310
Test: Manual test passed
Change-Id: I0f68bf470699df388855ec7277c0cfc24a2c30ba
 2023-07-21 15:49:02 +09:00
Charlotte Lu
51bf318f0e Button text to turn off the sim 
Split the string Turn off before making the translate changes.
Create a new <string name="sim_action_turn_off">Turn off</string>.

Fix: 283736831
Test: Visual Test
Change-Id: I35ee1d57ac575f83d46be331c95e7435f1de6c5f
 2023-07-20 17:59:31 +08:00
SongFerng Wang
b42d46fed5 Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev am: 717ce2b91f am: 96c2da1340 am: 723c5e8754 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23913080

Change-Id: I85cddc2f530b8d7308dcb742736e8b4210d7bb99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 06:44:49 +00:00
SongFerng Wang
723c5e8754 Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev am: 717ce2b91f am: 96c2da1340 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23913080

Change-Id: I2f10b967b2b98903e7bba9a9e0a74ab02ce1a8e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 06:02:24 +00:00
SongFerng Wang
d3f8caa506 Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev am: 717ce2b91f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23913080

Change-Id: Ifd57844fa7d17836a8c681b16b8b7e1830aabfec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 05:26:45 +00:00
SongFerng Wang
96c2da1340 Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev am: 717ce2b91f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23913080

Change-Id: Iabad339cd438114562b16a495f2e9c15249c38b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 05:22:21 +00:00
SongFerng Wang
717ce2b91f Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev 2023-07-11 04:55:18 +00:00
Chaohui Wang
dc3fc1dff0 Fix crash when call getMobileTemplate am: 9132535e5e am: f3d6684e14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002328

Change-Id: Ifbeab53d402207c0cd63ab225f30af6bdc4da824
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 08:56:59 +00:00
Chaohui Wang
1578772d63 Fix crash when call getMobileTemplate am: 9132535e5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002328

Change-Id: I01c40793839a7d5fbd0b7834c67184c228356c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 08:16:04 +00:00
Chaohui Wang
f3d6684e14 Fix crash when call getMobileTemplate am: 9132535e5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002328

Change-Id: Ia4b74067049da536c8f98230e588b579379fdad6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 08:12:07 +00:00
Chaohui Wang
9132535e5e Fix crash when call getMobileTemplate 
There are 2 versions of getMobileTemplate.

The previous Change I7865823d6af2c812afa35d047bd79b60ae4b0fb7 change
from the correct version to the wrong version.

Change back to fix the issue.

Fix: 290381395
Test: manual - on Mobile Settings page
Test: unit test
Change-Id: Icb3147558176d53dc77e7bd39ab54a5dad13c12b
Merged-In: I6227f973ec38e5b0520f54a41ac2ede2929a1bcc
 2023-07-10 14:20:07 +08:00
Treehugger Robot
6a12444366 Merge "Restrict ApnEditor settings" into main 2023-07-07 13:50:42 +00:00
Weng Su
5a17d39db7 Restrict ApnEditor settings 
- Finish ApnEditor settings if user is not an admin

- Finish ApnEditor settings if user has DISALLOW_CONFIG_MOBILE_NETWORKS restriction

Bug: 279902472
Test: manual test
atest -c ApnEditorTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4e18e7414c674a1c5bc69961c03499849b4aefd2)
Merged-In: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
Change-Id: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
 2023-07-07 12:11:33 +00:00
Weng Su
4e18e7414c Restrict ApnEditor settings 
- Finish ApnEditor settings if user is not an admin

- Finish ApnEditor settings if user has DISALLOW_CONFIG_MOBILE_NETWORKS restriction

Bug: 279902472
Test: manual test
atest -c ApnEditorTest

Change-Id: Iecdbbff7e21dfb11e3ba385858747a220cfd3e04
 2023-07-07 20:01:04 +08:00
SongFerngWang
d94ac12190 To fix waiting too long issue when psim -> esim 
if the user swithes slot from psim to esim, then the settings
need to wait the simSlotMapping completed and it has a timer to avoid
UI stay here too long.

Since the framework did not sned the carrier config changed with vaild
subId in MEP + psim->esim case, it cause the settings does not know the
simSlotMapping completed and it stay here until timeout.

For MEP case, changing this condition as SimSlotStatusChanged

Bug: 273813956
Test: atest UiccSlotUtilTest
Change-Id: Ic09dbcb3629fe13770f3ad301c0a396d6745969f
 2023-07-07 10:22:49 +00:00
Chaohui Wang
77fd6aa117 Use DataUsageLib in DataUsagePreferenceController 
DataUsagePreferenceController use DataUsageLib before, and DataUsageLib
and com.android.settingslib.net.DataUsageUtils has same functionality.

com.android.settingslib.net.DataUsageUtils will be clean up, so use
DataUsageLib again.

Bug: 286082055
Test: m Settings
Change-Id: I6227f973ec38e5b0520f54a41ac2ede2929a1bcc
 2023-07-04 19:08:46 +08:00
Chaohui Wang
47ff48b831 Fix DataUsagePreferenceController ANR am: d42cc8e5e2 am: eb8948e309 am: e76ff6ffa5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225

Change-Id: I2b24b59f1d0bcd2b02359128d474f36a74eb367e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-04 10:28:19 +00:00
Chaohui Wang
e76ff6ffa5 Fix DataUsagePreferenceController ANR am: d42cc8e5e2 am: eb8948e309 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225

Change-Id: I3e6b70cb33a51348b9504226787de2e149af5870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-04 09:41:58 +00:00
Chaohui Wang
a51e013746 Fix DataUsagePreferenceController ANR am: d42cc8e5e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225

Change-Id: Ia0463b25a848a1b65f10bfb3950b7875bc3498b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-04 09:03:56 +00:00
Chaohui Wang
eb8948e309 Fix DataUsagePreferenceController ANR am: d42cc8e5e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225

Change-Id: I6893681f93746af66e6566d2a642c2e1a93aef51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-04 08:59:57 +00:00
Chaohui Wang
d42cc8e5e2 Fix DataUsagePreferenceController ANR 
Offload calculation work from main thread to fix.

Fix: 286082055
Test: manual - on Mobile Settings page
Test: unit test
Change-Id: I7865823d6af2c812afa35d047bd79b60ae4b0fb7
 2023-07-04 12:06:53 +08:00
Treehugger Robot
90325d87cb Merge "[Settings] Fix inactive SIM show display name with subectiption id." into udc-qpr-dev am: 369a1097c8 am: 063ba027f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23844846

Change-Id: Idbedec3b88650b6a64c944bc6d62d2c1124dbb7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 08:15:39 +00:00
Treehugger Robot
063ba027f7 Merge "[Settings] Fix inactive SIM show display name with subectiption id." into udc-qpr-dev am: 369a1097c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23844846

Change-Id: Icbb09dc1917780104f35e797bffd5b2c51f6ec5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-30 07:34:05 +00:00
tom hsu
0b3da89a91 [Settings] Fix inactive SIM show display name with subectiption id. 
- Cached active SIM' display name with last 4 digits phone number to
   avoid that this active SIM change to inactive SIM then show the
   display name with subscription id.

Bug: 271567615
Test: Manual test passed
Test: atest passed
Change-Id: I119d60ab4e92b1f04fb42f96df10bc81aa378a7c
 2023-06-30 05:51:40 +00:00
Chaohui Wang
b17ef6f91e Fix cursor is empty in ApnEditor 
If cursor.moveToFirst() returns false, the cursor is empty which cause
crash.

Check whether the curse is empty to fix.

Fix: 288716180
Test: manual - on ApnEditor page
Test: m RunSettingsRoboTests
Change-Id: If850cd3feca3d3d520a653c2490d1049a8a87fdc
 2023-06-28 19:31:46 +08:00
Chaohui Wang
b3a06d46fa Merge "Fix ANR in TelephonyStatusControlSession" into udc-qpr-dev am: 99b29e068e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23761226

Change-Id: Ibeca1686a558a5f9fd9f55bec93169d34f3549fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-26 07:01:33 +00:00
Chaohui Wang
88fd45b1e6 Fix ANR in TelephonyStatusControlSession 
Feature.get() blocks on the main thread, which cause the ANR.

Cancel the job instead to fix.

Fix: 287702163
Test: Manually with MobileNetworkSettings
Test: atest TelephonyStatusControlSessionTest
Change-Id: Id873e56359dbf198c31686c2280c979294c95c3d
 2023-06-21 16:43:17 +08:00
Treehugger Robot
d9c0cf79e8 Merge "[Settings] Imporve MMS message UI state update" into udc-d1-dev am: 8182348d5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23669450

Change-Id: Ic3a17c6731869827bfff43d8a5de227ea0f9a657
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-17 07:05:29 +00:00
Treehugger Robot
7abcb94693 Merge "Fix Hotspot & tethering settings crash" into udc-d1-dev am: 3494d09de4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23691725

Change-Id: I2cc82b781919c303a70bcdb39c162d5a68fa7e34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-17 07:01:44 +00:00
Treehugger Robot
89639372d5 Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71 am: 2c73cc8ca8 am: 2010c175a6 am: 2d23561a25 am: c68d307ca8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935

Change-Id: I7b52296963a9e838863808db52675f454951ace3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 13:09:53 +00:00
Treehugger Robot
c68d307ca8 Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71 am: 2c73cc8ca8 am: 2010c175a6 am: 2d23561a25 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935

Change-Id: I7f514c59303087a72787d6c0814ede0ecdf0743d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 12:31:02 +00:00
Treehugger Robot
2d23561a25 Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71 am: 2c73cc8ca8 am: 2010c175a6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935

Change-Id: I575d1fc77fefd4bd5b441403f0bc88cf7ede8b5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 11:44:07 +00:00
Treehugger Robot
2010c175a6 Merge "'Mobile plan' is searchable even if it is unavailable" am: a3f9f42b71 am: 2c73cc8ca8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2625935

Change-Id: I9c423f5290eec4f6a8ac68aca4ece6b6675e7a5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 10:33:50 +00:00