Commit Graph

139255 Commits

Author SHA1 Message Date
Tim Murray
db775bdac9 Merge "JobScheduler: remove TARE" into main 2024-04-01 15:21:04 +00:00
Fan Wu
ca8f6abe3f Merge "Ignore MainClearTest as it's crashing Postsubmit process" into main 2024-04-01 09:58:57 +00:00
Treehugger Robot
b9c1632a5f Merge "Fix the action bar shows up problem" into main 2024-04-01 09:29:28 +00:00
Haijie Hong
0f97d4fbc3 Merge "Dismiss notification shade when pairing dialog shown." into main 2024-04-01 09:08:31 +00:00
Fan Wu
ac1c5c7274 Ignore MainClearTest as it's crashing Postsubmit process
Bug: 329736064

Test: atest
Change-Id: Ia3f60a525247566f74cd93598800043581a4fc83
2024-04-01 16:59:33 +08:00
Chaohui Wang
3ea08203af Merge "Align PreSelectedTypes with Android U" into main 2024-04-01 08:55:52 +00:00
Angela Wang
c82282cf95 Merge "Register callback again after service is connected" into main 2024-04-01 08:19:32 +00:00
YK Hung
6d02ca945f Merge "Update logs of BatteryEntry & BatteryHistEntry" into main 2024-04-01 05:50:04 +00:00
Chaohui Wang
333c309742 Align PreSelectedTypes with Android U
The Android U pre selected types:
default,mms,supl,dun,hipri,fota,cbs,xcap

Fix: 331875869
Test: manual - on ApnSettings
Test: unit test
Change-Id: I60c9a1a68af1b78825b9f08338b6001f99699414
2024-04-01 11:50:35 +08:00
mxyyiyi
7cea50775d Update logs of BatteryEntry & BatteryHistEntry
Bug: 331426391
Test: manual
Change-Id: I2825cecbaab35b3ef4a645a9e2d57f579d88ef19
2024-04-01 11:28:31 +08:00
SongFerng Wang
fd6ae421fd Merge "Add log for setDataEnabledForReason" into main 2024-03-30 15:37:14 +00:00
Treehugger Robot
22241f18ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 3bfbd3f08b -s ours
am skip reason: contains skip directive

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

Change-Id: I19036f090210560f738313a07871ecef6aa1deda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-29 22:50:40 +00:00
Bill Yi
5b425981c8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 37746d10f0 -s ours
am skip reason: contains skip directive

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

Change-Id: Ie7221331d3bad6e7adb51bfed7e649ec8b8e274a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-29 22:50:33 +00:00
Bill Yi
adcbb3b1a0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff9585eb97 -s ours
am skip reason: contains skip directive

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

Change-Id: Ia603548ad1e2cb43bcf9255cc5ee72b19dea96dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-29 22:40:58 +00:00
Automerger Merge Worker
6fec5338b5 Merge changes from topic "am-d6f679a9148840b4beaadf3677246075" into main
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 5534cc5b1c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 89373d1cca -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 6450b92abf -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0217eb4478 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 55b2618244 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d48c3b26f -s ours
2024-03-29 22:37:14 +00:00
Treehugger Robot
23f02d08f4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 5534cc5b1c -s ours
am skip reason: contains skip directive

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

Change-Id: I1576a30b5b7b11d50089731266aa4c1d2b1f4212
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-29 22:36:53 +00:00
Bill Yi
812a15501e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 89373d1cca -s ours
am skip reason: contains skip directive

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

Change-Id: I503f3e3b70c6c63193d5025efaf00678de40ed11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-29 22:36:36 +00:00
Treehugger Robot
dc76b947df [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 6450b92abf -s ours
am skip reason: contains skip directive

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

Change-Id: Ie0dcdd144f397cf36fcfe5ccef600d04f5220f42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-29 22:36:32 +00:00
Bill Yi
a1604e346a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0217eb4478 -s ours
am skip reason: contains skip directive

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

Change-Id: Icbb59d2787918b708f6b007a34a7a2eb066870d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-29 22:36:29 +00:00
Treehugger Robot
b62abb0209 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 55b2618244 -s ours
am skip reason: contains skip directive

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

Change-Id: Id92dff473284f7e45397609909a692493e1f019b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-29 22:36:20 +00:00
Treehugger Robot
c724d2ed7f Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-03-29 22:36:19 +00:00
Treehugger Robot
64ace3b6ef Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-03-29 22:36:19 +00:00
Treehugger Robot
82b5c40a23 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-03-29 22:36:19 +00:00
Bill Yi
58bf38de1c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d48c3b26f -s ours
am skip reason: contains skip directive

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

Change-Id: I5f89a8f6ee7b1edbc31441d8a0a9253ad85c3dab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-29 22:36:11 +00:00
Treehugger Robot
3bfbd3f08b Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2024-03-29 22:36:08 +00:00
Becca Hughes
92485a7308 Merge "Implement policy transparency for CredMan" into main 2024-03-29 22:20:11 +00:00
Treehugger Robot
5534cc5b1c Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-03-29 22:17:51 +00:00
Treehugger Robot
6450b92abf Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-03-29 22:17:51 +00:00
Treehugger Robot
55b2618244 Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-03-29 22:17:51 +00:00
Priyanka Advani
27d7b192f7 Merge "Revert "Add waiting screen before PS setup completion"" into main 2024-03-29 21:43:30 +00:00
Priyanka Advani
d2c91b587e Revert "Add waiting screen before PS setup completion"
This reverts commit 7b0b26ec92.

Reason for revert: b/331935387. ACA has already verified the revert.

Change-Id: Idf28854f25c4bad3563408dbb7b5c84f0cdbe2f2
2024-03-29 21:30:27 +00:00
Anna Bauza
1a621c4910 Merge "Refactor SettingsLib to remove redundant resources conditionally" into main 2024-03-29 21:08:49 +00:00
Kyle Zhang
6565292c71 Merge "Modify test to accomodate unchangable flag" into main 2024-03-29 20:58:10 +00:00
Daniel Norman
27607a47a5 Merge "fix(magnification): make always on toggle unavailable when capabilities is window only" into main 2024-03-29 19:09:35 +00:00
Becca Hughes
9931d03f6f Implement policy transparency for CredMan
This CL implements policy transparency for
Credential Manager settings.

Screenshots:
https://hsv.googleplex.com/5502938857340928
https://hsv.googleplex.com/4999933426925568

Test: on device w/ test dpc
Bug: 318552220
Change-Id: I78e1fa47541c81e6e2d2bf2c13159be01928e77c
2024-03-29 09:56:47 -07:00
Anna Bauza
6346ae2aab Refactor SettingsLib to remove redundant resources conditionally
Bug: 320878675
Test: manual
Change-Id: I21b7cf56c74be759ac95621498b753ac70d143b2
2024-03-29 14:43:51 +00:00
Joseph Vincent
ea6500455a Merge "Add waiting screen before PS setup completion" into main 2024-03-29 14:30:07 +00:00
Haijie Hong
4a7f329862 Dismiss notification shade when pairing dialog shown.
Test: atest BluetoothPairingDialogTest
Bug: 307941039
Change-Id: I23eceb846045dba79bf660a32a669f924ab72492
2024-03-29 20:55:49 +08:00
Fan Wu
70272cdcde Merge "Remove LooperMode.LEGACY usage from two test classes" into main 2024-03-29 10:10:18 +00:00
Fan Wu
3fdb68c2c2 Merge "Remove LooperMode.LEGACY usage from settings/applications path." into main 2024-03-29 10:09:59 +00:00
Jason Chiu
6ca5c992d7 Merge "[Safer intents] Permission controller" into main 2024-03-29 09:20:28 +00:00
songferngwang
be3008e09d Add log for setDataEnabledForReason
To know who change the mobile data

Bug: 331843727
Test: NA Adding log only
Change-Id: I3ef5662102761541cd3e0e4662e0acab07c71937
2024-03-29 09:06:34 +00:00
Jason Chiu
cac043d82e Merge "[Safer intents] Settings misc" into main 2024-03-29 06:36:45 +00:00
Jason Iman
0173ee480c Merge "arc: Use ChromeOS host's IP address for WiFi ADB" into main 2024-03-29 05:05:39 +00:00
Jason Chiu
0bd014c497 [Safer intents] Settings misc
To avoid implicit intents, make intents launch explicitly.

Test: build
Bug: 323061508
Change-Id: Ie19cbceb89842a75a180898abcce81b63c18d46c
2024-03-29 04:22:45 +00:00
Angela Wang
eebd44074a Register callback again after service is connected
The exception is thrown when trying to unregister a not-registered callback. This may happen when after rebooting the device, the proxy is not attached to the service while registerCallback() is called in onResume(). The callback will not be correctly registered and hence causing this exception when unregisterCallback() is called in onPause().

Add listener to listen the onServiceConnected() callback and re-register
the callback if the service is not connected when user enters to the
page.

Bug: 330116041
Test: manually test the scenario and confirm no exception thrown
Change-Id: I1f99d067e28e285bcbfff1f34bd322cdbac8063a
2024-03-29 03:53:00 +00:00
Fan Wu
4bb2bff03e Remove LooperMode.LEGACY usage from two test classes
Bug: 330824314

Test: atest
Change-Id: Ic8e6aa633d72b7680a9ff8c6e37a66c64778c26a
2024-03-29 10:49:53 +08:00
Fan Wu
cf3649f21b Remove LooperMode.LEGACY usage from settings/applications path.
Bug: 331546577

Test: atest
Change-Id: I419100b302bee55a06fbc481232927ea44a68bd3
2024-03-29 10:48:50 +08:00
YK Hung
e78fd23820 NPE protection for invokeJobRecheck() in the fragment
Ensure getContext() is not null before invokeJobRecheck() in the
background, since the main fragment may be detached to return null
context (in the corner case)

Test: atest
Fix: 331719252
Change-Id: Ia7ba757d2e6ebaf3fd371af51270c0eb0ad0a9f7
2024-03-29 02:48:11 +00:00
Jason Chiu
9507bdb3ac Merge changes from topic "overlay_packages" into main
* changes:
  [Safer intents] Notifications
  [Safer intents] Define package names in Settings
2024-03-29 01:14:26 +00:00