Commit Graph

110283 Commits

Author SHA1 Message Date
Treehugger Robot
a78f068b4b [automerger skipped] Merge "Support AIDL IDumpstateDevice service in verbose vendor logging" am: f7200dd58a -s ours
am skip reason: Merged-In I4a2ec44092804574a60113e5be3df19b586bfa64 with SHA-1 c9292dc792 is already in history

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

Change-Id: Iadf9d17b8dbd25210f802971d56511b787d046dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-27 06:00:09 +00:00
Rambo Wang
93634528ec [automerger skipped] Support AIDL IDumpstateDevice service in verbose vendor logging am: 306a366d12 -s ours
am skip reason: Merged-In I4a2ec44092804574a60113e5be3df19b586bfa64 with SHA-1 c9292dc792 is already in history

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

Change-Id: I4e8d4f48bd91bea285a0e142aea79630e62650f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-27 06:00:06 +00:00
Treehugger Robot
f7200dd58a Merge "Support AIDL IDumpstateDevice service in verbose vendor logging" 2022-10-27 05:31:45 +00:00
Rambo Wang
306a366d12 Support AIDL IDumpstateDevice service in verbose vendor logging
IDumpstateDevice HAL switched to AIDL service in P22 devices.
This change will firstly apply to AIDL service if available and
fall back to HIDL service if not, making the feature work for
both HIDL an AIDL based devices.

Bug: 242634531
Test: make && make RunSettingsRoboTests
Change-Id: I4a2ec44092804574a60113e5be3df19b586bfa64
Merged-In: I4a2ec44092804574a60113e5be3df19b586bfa64
(cherry picked from commit 17a9fb6bec)
2022-10-26 10:23:25 -05:00
Treehugger Robot
c54246e0c8 Merge "Ensure search highlight position when scheduled runnable starts" am: fcd941b4eb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2263782

Change-Id: I3d0a338bb220705a255a7abc123d490ee19f44af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-25 08:01:42 +00:00
Treehugger Robot
fcd941b4eb Merge "Ensure search highlight position when scheduled runnable starts" 2022-10-25 07:35:26 +00:00
Treehugger Robot
9fd4f504e2 Merge "Fix typo in WifiCallingSettingsForSub" am: 8959f0698a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2267745

Change-Id: I8a6caaabac8c6e718bb52edcf8c390ca22dd579c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-25 07:11:48 +00:00
Treehugger Robot
8959f0698a Merge "Fix typo in WifiCallingSettingsForSub" 2022-10-25 06:30:47 +00:00
Shen Lin
f20f8bc71a Fix typo in WifiCallingSettingsForSub
test: compile pass
Change-Id: I719a9a634a3b321533462f8e9fef9c183c042335
2022-10-25 11:37:04 +08:00
Shen Lin
bb2fb2ffd6 Ensure search highlight position when scheduled runnable starts
Search highlight function includes two steps: Scroll list to target position first, then notifyItemChanged to it.

We use a Handler.postDelay to implement this. However, when scheduled runnable starts, the original target position could have changed due to preference list update, calling recyclerview's methods after that will be easy to cause an exception.

This CL ensures highlight position every time before calling recyclerView update, which also contribute to origin fix of RecyclerView IllegalArgumentException to a certain extent.

Test: atest, also test some search results, and see the correct behavior
Fixes: 246411107

Change-Id: Ifa758ce3718b047138079246cdfce99fdf66d5b2
2022-10-21 14:01:47 +08:00
Treehugger Robot
5408baabdd Merge "network: fix binder object leakage in settings" am: bdcd3a3975
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2136792

Change-Id: I141693097ed912ff223b3be3fa997a51b6713ecd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-21 03:52:48 +00:00
Treehugger Robot
bdcd3a3975 Merge "network: fix binder object leakage in settings" 2022-10-21 03:25:39 +00:00
Jason Huang
2bb35ff3fc network: fix binder object leakage in settings
Summary:
When BT ON and enter into NetworkDashboardFragment, and turning BT OFF and exiting the fragment, the `BluetoothAdapter.closeProfileProxy(BluetoothProfile.PAN)` will not be called.
This causes binder leakage on next time the NetworkDashboardFragment is entered, until killing Settings process.

Reproduce Steps:
1. Turn BT ON
2. Open Settings process
3. Enter "Network & internet" (NetworkDashboardFragment)
4. Turn BT OFF
5. Back to previous page (do not kill Settings process)
* Repeat Step 3-5

Solution:
Do not set value of `mBluetoothPan` to null when `onServiceDisconnected` raised, to ensure the binder object (profile proxy) be closed in lifecycle `onDestroy()`.

Bug: 243128377
Test: enter "Network & internet" page, turn off BT and leave the page
Change-Id: Ieca3e5401c23d1b0ffece1bbb0db96988044262d
2022-10-19 22:07:55 +08:00
Bonian Chen
5f5bcf56ca Merge "[Settings] align the long press behavior on secondary sim" am: 90dcc7c5c1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2261204

Change-Id: Icece91f8119388bbf7bca7129b9f077bc0c857a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 08:32:33 +00:00
Bonian Chen
90dcc7c5c1 Merge "[Settings] align the long press behavior on secondary sim" 2022-10-19 08:01:34 +00:00
Bonian Chen
7364b9bbe3 [Settings] align the long press behavior on secondary sim
Within Settings app, long press allows user to copy status/summary part
when it comes to first SIM.

This is a commit to enable the same feature on the second sim.

Test: local
Change-Id: I58d9cf9cbba213196536781d41b9ec81c0142960
2022-10-19 01:47:11 +00:00
Treehugger Robot
6372ae5e93 Merge "Fix crash when input illegal proxy port number" am: e8160af796
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255620

Change-Id: Idc35fa976db5cfde013ec9c32191869e84c7801f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 20:42:36 +00:00
Treehugger Robot
e8160af796 Merge "Fix crash when input illegal proxy port number" 2022-10-18 20:17:08 +00:00
Treehugger Robot
24e8db3335 Merge "Fix crash when showing error dialog in NetworkRequestDialogActivity" am: d791f7b967
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2255618

Change-Id: I34ec41a3b0cd28029595e70164501dd1350e96b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-18 04:42:26 +00:00
Treehugger Robot
d791f7b967 Merge "Fix crash when showing error dialog in NetworkRequestDialogActivity" 2022-10-18 04:09:49 +00:00
Shen Lin
a911e61ce7 Fix crash when input illegal proxy port number
Bug: 253951250
Test: manual and atest
Change-Id: I80d2f0e3ce2df86a081b29d8633e06cfc648baeb
2022-10-18 09:18:57 +08:00
Shen Lin
72e5a7ea21 Fix crash when showing error dialog in NetworkRequestDialogActivity
Fix: 253913148
Test: manual
Change-Id: I23593da1ef6d72806f22d3501b06a8e7abadb100
2022-10-17 09:30:16 +08:00
Treehugger Robot
c0904055f4 Merge "Fix "show system apps" status lost when switching on/off dark theme" am: df8e9c630a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2253577

Change-Id: Ie35b84bc9e348997fc34f58ded21c84e191e6786
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-13 14:35:09 +00:00
Treehugger Robot
df8e9c630a Merge "Fix "show system apps" status lost when switching on/off dark theme" 2022-10-13 14:09:17 +00:00
Shen Lin
d956175333 Fix "show system apps" status lost when switching on/off dark theme
Bug: 253388290
Test: manual and atest
Change-Id: I5833f94478c2faaf53d40652f0e7ce92adb3e8b6
2022-10-13 12:19:11 +00:00
Xin Li
5ebaa600a1 Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9129937" into stage-aosp-master 2022-10-11 17:39:16 +00:00
Treehugger Robot
44431c73e7 Merge "Add fallback summary text if there is no matching screen timeout value" am: 007c215c3e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2239486

Change-Id: I2a5103f40ff538d327f1db9d1062de044683b615
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-11 06:27:16 +00:00
Treehugger Robot
007c215c3e Merge "Add fallback summary text if there is no matching screen timeout value" 2022-10-11 05:51:12 +00:00
Shen Lin
97a61bad7d Add fallback summary text if there is no matching screen timeout value
Screen timeout summary string can be null if there is no matching candidate, so we need a fallback summary here to avoid showing unexpected summary text.

Bug: 252340891
Test: manual

Change-Id: I939ae97a50063b2ffe84029135c3f340aeedf4c7
2022-10-09 01:59:02 +00:00
Xin Li
302b01f8e2 Merge tm-qpr-dev-plus-aosp-without-vendor@9129937
Bug: 248070379
Merged-In: I9ebe26c6a8058798ea654523ad1405a8447268b8
Change-Id: Ib8c6441f2165784804a1863bcfce6b05d20ecfd3
2022-10-06 12:22:57 -07:00
Xin Li
ec0cf19aad Merge "Merge TP1A.221005.003" am: 2af8366306
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2240893

Change-Id: Ic9f25644a305419732cb5406b96166e8708a3975
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05 22:39:29 +00:00
Xin Li
2af8366306 Merge "Merge TP1A.221005.003" 2022-10-05 22:20:14 +00:00
Treehugger Robot
fe38c3c91e Merge "Remove A2dp offload disabled and LE audio offload enabled combination" am: bcde51cf09
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2240358

Change-Id: I4ecfd48d3e62eeaf01452283111d2ddaf7acb29c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05 16:26:25 +00:00
Treehugger Robot
bcde51cf09 Merge "Remove A2dp offload disabled and LE audio offload enabled combination" 2022-10-05 16:04:05 +00:00
Alice Kuo
7cc845026c Remove A2dp offload disabled and LE audio offload enabled combination
In order to reduce the complexity, LE audio offload couldn't be
enabled as a2dp offload disabled. Remove the combination from the
developer option
1. As a2dp offload disabled, LE audio offload couldn't be switched.
2. As the user disable a2dp offload, LE audio offload would be disabled
   as well

Bug: 238268927
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioHwOffloadPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothA2dpHwOffloadPreferenceControllerTest
Change-Id: I9ebe26c6a8058798ea654523ad1405a8447268b8
2022-10-04 23:48:11 +08:00
Xin Li
f51d201af3 Merge TP1A.221005.003
Merged-In: Ia825853dde2e966e3d390cecfbe1a99f6439d31e
Change-Id: Ia7b51d3cc694287b930d240c77e5ba0ed9a527f4
2022-10-03 13:17:48 -07:00
TreeHugger Robot
7b435b6111 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5b8a3aabaa -s ours am: 353daaa2f7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1ecf75b27f5ed85648f2d4dd26ccbedb8adbc399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-02 08:23:48 +00:00
Bill Yi
7a3ba54d23 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ce9e908f9 -s ours am: 567c6dd3ca -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib340ffec431f5a77e5b181830192ec9516c8d8a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-02 08:23:25 +00:00
TreeHugger Robot
1f0962c3c1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5b8a3aabaa -s ours am: db09b990a0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic00f62d2e84db365ddfcd3eb0d629c1da51f1de2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-02 08:21:26 +00:00
Bill Yi
02fa63e2fc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ce9e908f9 -s ours am: 0aca2c219d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I81058835048aa75939c95147f0a8b71dc19584bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-02 08:21:09 +00:00
TreeHugger Robot
353daaa2f7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5b8a3aabaa -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia73419f75f327782d073cefa48ad1d65a87e9b7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-02 07:54:35 +00:00
TreeHugger Robot
db09b990a0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 5b8a3aabaa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I91e0858307d1055b300a67ae7ba22b9897bac4b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-02 07:54:31 +00:00
Bill Yi
567c6dd3ca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ce9e908f9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0c47748f2ea5d2e6691937acee6c91d96bcc5122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-02 07:54:12 +00:00
Bill Yi
0aca2c219d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3ce9e908f9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6dd06d608b1b319d2214514a145b7c178378bbd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-02 07:54:11 +00:00
TreeHugger Robot
5b8a3aabaa Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-10-02 07:26:20 +00:00
Bill Lin
6b763d1999 Merge "Do not override SUW Glif theme when onApplyThemeResource() callback" into tm-qpr-dev am: e5a4e38c8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20080179

Change-Id: I5a16ac472b0a08273d2410b39741675a6f998f51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-01 00:22:29 +00:00
Bill Lin
e5a4e38c8c Merge "Do not override SUW Glif theme when onApplyThemeResource() callback" into tm-qpr-dev 2022-09-30 23:54:31 +00:00
Bill Yi
ba331be678 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368 -s ours am: 4bf99a1f0f -s ours am: 148f0a8591 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I59052a6cddf76148650c3def3f875a3c7f3650ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-30 21:40:34 +00:00
Bill Yi
6c8ff68ac2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368 -s ours am: 6cf6175ec3 -s ours am: 3a2a9c27a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6b48eeedb2292e93045ca38617113ee3ccb62e91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-30 21:17:07 +00:00
Bill Yi
e6d49db2fc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368 -s ours am: 4bf99a1f0f -s ours am: e7722ef90c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib5f00df6d8bf3d9543a1d41c96af4f8a1ee7b911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-30 21:08:39 +00:00