PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
127,328 Commits 1 Branch 0 Tags
3c35c8fe93baed6a31ebbcaa764f1a6ed4559d8c
Commit Graph

127328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
1772599751 [automerger skipped] Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3 am: 758c01fbb8 -s ours am: cfa6458241 -s ours am: 949e8e505f -s ours 
am skip reason: Merged-In Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d with SHA-1 8e9119f5ab is already in history

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

Change-Id: I8555b696841bb1c2dc38223608fd992054904f2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 10:40:04 +00:00
TreeHugger Robot
c8d55217d9 Merge "Remove search entries from old pages when SC is on." into udc-dev am: d2e8495f4c am: 520927752a am: 1609640693 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23122025

Change-Id: I053834788cb87b086f4c0d933d84a77dc782c3be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 10:13:43 +00:00
Tom Hsu
7c2b7377c9 Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555 am: 07db6514d3 am: b679aff5a0 am: 01594df3c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916

Change-Id: I82ebe3e05ca7d8d5d37468a81ec51cfb58c83002
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 10:13:12 +00:00
TreeHugger Robot
df4135df6e Merge "Remove search entries from old pages when SC is on." into udc-dev am: d2e8495f4c am: 402ffdeaf6 am: 199e699214 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23122025

Change-Id: Ic99fb07b4c7bc3125e2680c0e68b20792ed45f5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 10:12:30 +00:00
TreeHugger Robot
23f1777501 Merge "Remove search entries from old pages when SC is on." into udc-dev am: d2e8495f4c am: 520927752a am: 729572c7c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23122025

Change-Id: I87b8672b99f8a9bfe0d4f03adfa62c24dfc8e257
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 10:12:08 +00:00
Treehugger Robot
4d61561fa3 Merge "Fix non-hearing devices show in pair new hearing devices page" into udc-dev am: 59fa9de0cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155081

Change-Id: I94f33e7f52875dbccbf6327430a6192ce01a4ff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 10:10:41 +00:00
Treehugger Robot
da48c087e0 Merge "Fix non-hearing devices show in pair new hearing devices page" into udc-dev am: 59fa9de0cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155081

Change-Id: I51b54455d5c2dd73c380fac22b345bc83570397f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 10:09:51 +00:00
Treehugger Robot
2577777783 Merge "Fix non-hearing devices show in pair new hearing devices page" into udc-dev am: 59fa9de0cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155081

Change-Id: I0a15956e5d12549aa269f11d02a0854c9f34c09a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 10:09:44 +00:00
TreeHugger Robot
e1e0aa8721 [automerger skipped] Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3 am: 728b1b8337 am: 00cc06ab7a am: d3d03b6024 -s ours 
am skip reason: Merged-In Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d with SHA-1 8e9119f5ab is already in history

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

Change-Id: Ic167119b796189e9e48e20216177185228328597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 09:59:28 +00:00
Tom Hsu
eb49a68529 Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555 am: 4d3264553c am: 32dd2dc83c am: c01bb6d556 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916

Change-Id: If357c402f3e4c5f197dae56ad54a402671a9c408
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 09:51:35 +00:00
Treehugger Robot
59fa9de0cf Merge "Fix non-hearing devices show in pair new hearing devices page" into udc-dev 2023-05-11 09:42:23 +00:00
TreeHugger Robot
1609640693 Merge "Remove search entries from old pages when SC is on." into udc-dev am: d2e8495f4c am: 520927752a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23122025

Change-Id: Ie143435cbe81895834aaa32d53b7cef4e369845c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 09:28:05 +00:00
TreeHugger Robot
199e699214 Merge "Remove search entries from old pages when SC is on." into udc-dev am: d2e8495f4c am: 402ffdeaf6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23122025

Change-Id: I263cd51d709313f9f4a02c0082a6239df1df031a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 09:27:57 +00:00
TreeHugger Robot
1e68cd7694 Merge "Remove search entries from old pages when SC is on." into udc-dev am: d2e8495f4c am: cbd61dd5cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23122025

Change-Id: I5fc013890ea0b48796df9a8af100a2593f42e2cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 09:25:50 +00:00
TreeHugger Robot
729572c7c4 Merge "Remove search entries from old pages when SC is on." into udc-dev am: d2e8495f4c am: 520927752a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23122025

Change-Id: I4b88361ee8642874efec24fdd04174ba13363658
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 09:25:10 +00:00
Mill Chen
f321799f43 Update string for touch sounds 
Bug: 274081150
Test: visual verify
Change-Id: I953f108884cafc91e2a3a76bd1292ea30386d862
 2023-05-11 17:24:32 +08:00
SongFerng Wang
6c19f30e5d Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c am: 343602fd5e am: 2bcba729cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659

Change-Id: I3f7096ea91f120b770d90eb11768f5806928ac0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 09:09:21 +00:00
SongFerng Wang
80cc037fe1 Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c am: 343602fd5e am: ac69e243c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659

Change-Id: Ie24d17086cb0cbc7e5d31bd67104fe6e502a4dfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 08:44:56 +00:00
TreeHugger Robot
402ffdeaf6 Merge "Remove search entries from old pages when SC is on." into udc-dev am: d2e8495f4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23122025

Change-Id: Iacfe9bbe1a258baac3e48c24e283b1ed3954cf2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 08:44:49 +00:00
SongFerng Wang
cf3414f8ec Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c am: 2319563b00 am: 96df087783 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659

Change-Id: I76defcdb6c47da075e432484db3e07308eaadee1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 08:44:33 +00:00
TreeHugger Robot
cbd61dd5cf Merge "Remove search entries from old pages when SC is on." into udc-dev am: d2e8495f4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23122025

Change-Id: Ib48abb961c1a2b82fe9de5123ec0a557297f87c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 08:44:19 +00:00
TreeHugger Robot
520927752a Merge "Remove search entries from old pages when SC is on." into udc-dev am: d2e8495f4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23122025

Change-Id: Ibb95d6559eccf81d77ebd9299359d3b93a3c784c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 08:44:17 +00:00
jasonwshsu
7eeed19d28 Update hearing aids to hearing devices 
* We change the string 'hearing aids' to 'hearing devices', here are
  some left strings need to be updated.

Bug: 281782174
Test: flash rom and check UI
Change-Id: I0e3395c91d42b037158d135d1cbe519acac50aa0
 2023-05-11 16:41:54 +08:00
Yanting Yang
bc297b9f3c Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL 
When DISALLOW_APPS_CONTROL restriction is enabled, users should not be
able to enable/disable apps, clear app caches and clear app data.

“System >Reset options > Reset app preferences” can take the above
actions which should be restricted by DISALLOW_APPS_CONTROL to fix the
security vulnerability.

Bug: 278559731
Test: Verify change by turning on/off DISALLOW_APPS_CONTROL with TestDPC.
Change-Id: I387a95aa7f54fe04d5ed92372e43a88d5fe3e79a
 2023-05-11 16:29:07 +08:00
Angela Wang
fb0d23955d Fix non-hearing devices show in pair new hearing devices page 
Non-hearing devices are listed in "pair new hearing devices page" if we click the "See more devices" button and go back from "general pair new devices page".

Root cause:
Two types of Bluetooth scanning happen simultaneously and the scanning results of different scanning methods are handled in the same place. Currently the BLE scanning callback “onScanResult()” directly calls “onDeviceAdded()” method to handle the new scanned devices. This method is mainly called when receiving a broadcast of a new device found in Bluetooth classic scanning. The general pair new devices page uses Bluetooth classic scanning and the pair new hearing devices page uses Bluetooth LE scanning. The life cycle ordering when going back from general pair new devices page to pair new hearing devices page will be "pair new hearing devices page".onStart() -> "general pair new devices page".onStop(). It means the classic scanning is not stopped while the BLE scanning starts and this causes the scanning results from classic scanning unexpectedly added to the list which should only show the scanning results from BLE scanning.

Solution:
Separates the handling part of two scanning methods. Leaves "onDeviceAdded" handling Bluetooth classic scanning results only, and handles BLE scanning results in the “onScanResult” callback directly.

Bug: 279374435
Test: checks the result by switching back from "general pair new devices page" to "pair new hearing devices page"
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DeviceListPreferenceFragmentTest
Change-Id: Iebdde401ffb3dc0569478730a140a5dd7add115b
 2023-05-11 08:28:12 +00:00
SongFerng Wang
2bcba729cf Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c am: 343602fd5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659

Change-Id: Id67f939ab2424f6913eb221bb6ed70d68f0e8393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 08:25:09 +00:00
SongFerng Wang
ac69e243c1 Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c am: 343602fd5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659

Change-Id: I77e397cd0cc75fb1c5b6e93c909b4be293bc3b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 08:21:06 +00:00
SongFerng Wang
b421dfeeac Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c am: 376ca216ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659

Change-Id: I56e8b9e3330c1a933ed39f426b598791a560bb45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 08:21:03 +00:00
TreeHugger Robot
d2e8495f4c Merge "Remove search entries from old pages when SC is on." into udc-dev 2023-05-11 08:14:04 +00:00
SongFerng Wang
96df087783 Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c am: 2319563b00 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659

Change-Id: I1d2da49d6dae634f3498943fd42c79e5e2956076
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 08:05:52 +00:00
SongFerng Wang
343602fd5e Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659

Change-Id: Ifd85fa0461be871e9bdc52977f1e5b91a8fa1aac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 07:44:20 +00:00
SongFerng Wang
376ca216ad Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659

Change-Id: I768f9c3b6d1ee556bbd2238ea1f3b72ae008bac3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 07:44:15 +00:00
SongFerng Wang
2319563b00 Merge "Update the wording for LE Audio" into udc-dev am: c487d5a10c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23156659

Change-Id: I7745d09826da393c5d3c2377f37ab2761d313dc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 07:40:02 +00:00
SongFerng Wang
c487d5a10c Merge "Update the wording for LE Audio" into udc-dev 2023-05-11 07:11:11 +00:00
TreeHugger Robot
a40d45dec0 [automerger skipped] Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3 am: 728b1b8337 am: 134b71f95f -s ours 
am skip reason: Merged-In Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d with SHA-1 8e9119f5ab is already in history

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

Change-Id: I500743115266907cd963c0ad4aaa31132d6613a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 06:22:10 +00:00
Tom Hsu
571a7f1d37 Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555 am: 4d3264553c am: b40c753898 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916

Change-Id: Ie66861304e65fec17aa48c59c11052c0cafc069a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 06:21:30 +00:00
Bill Yi
31de22b7e4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5 -s ours am: c8c199020a -s ours am: 541d74eb4d -s ours am: df7171b29c -s ours am: 033e4f621c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4a886fac9ee49e18872c7fcbef185e86134d4f54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 06:02:33 +00:00
TreeHugger Robot
949e8e505f [automerger skipped] Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3 am: 758c01fbb8 -s ours am: cfa6458241 -s ours 
am skip reason: Merged-In Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d with SHA-1 8e9119f5ab is already in history

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

Change-Id: Iecf7b12e1bb4aabfd9f95efd1928b42ef0a827e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 05:57:46 +00:00
Tom Hsu
01594df3c5 Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555 am: 07db6514d3 am: b679aff5a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916

Change-Id: I6d35d0d72ad481ed06153e0d285143ea731954f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 05:56:49 +00:00
TreeHugger Robot
d3d03b6024 Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3 am: 728b1b8337 am: 00cc06ab7a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23139605

Change-Id: Ie1c70892210b053feea648835b6a4e66e00fa229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 05:56:00 +00:00
Tom Hsu
c01bb6d556 Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555 am: 4d3264553c am: 32dd2dc83c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916

Change-Id: I30b6f5bcab99c7eaf0a428fd2aa5d5b6ccfaaa92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 05:54:27 +00:00
Bill Yi
3ad426e075 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5 -s ours am: c8c199020a -s ours am: 2b214a4e1a -s ours am: fe4f51b4ab -s ours am: 43bfeadf44 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I54bb0f38b617aa05b8d87e97b8374030ed19cb83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 05:43:43 +00:00
Bill Yi
668807e767 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7a494fc7c5 -s ours am: c8c199020a -s ours am: 541d74eb4d -s ours am: c5708ff051 -s ours am: d0e755b576 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib77daf65484b0c60db6a6f6757d485f02373ebfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 05:39:56 +00:00
Angela Wang
bec64bf5cf Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188 am: e9106f35ce am: f4b7715453 am: 750a6907ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916

Change-Id: Ia752ea39efedb391e0b81de689b11c1715ee506b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 05:39:02 +00:00
Angela Wang
d7d238136a Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188 am: e9106f35ce am: 378e9f073d am: cc52fa2c4a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916

Change-Id: I1f8caec90bff5eebac410535cd5a0990dd710a61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 05:38:53 +00:00
Angela Wang
de783f1b52 Merge "Disabled state UI of Flash Notifications preview button" into udc-dev am: 22d3116188 am: 16fc56f72c am: c4ff1e822f am: f9561db866 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081916

Change-Id: I9459abdfd28ce2ed85e39500deb10eaf69c16e92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 05:38:39 +00:00
TreeHugger Robot
cfa6458241 [automerger skipped] Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3 am: 758c01fbb8 -s ours 
am skip reason: Merged-In Ic2b59c42ed4ddbc83a770b8bb99c641d2f1a383d with SHA-1 8e9119f5ab is already in history

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

Change-Id: I4f749c52da2f4370fe6771caa342024a5ced4603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 05:35:37 +00:00
TreeHugger Robot
134b71f95f Merge "Show disable dialog box when none is selected" into udc-dev am: 1742524dd3 am: 728b1b8337 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23139605

Change-Id: I6ed8ede29cd4bc43039081864a020b36b1e9117c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 05:35:31 +00:00
Tom Hsu
b679aff5a0 Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555 am: 07db6514d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916

Change-Id: I18f2b39a05daa7d95ba41e8d5d1386daa86e9a65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 05:34:34 +00:00
Tom Hsu
b40c753898 Merge "[Settings] Avoid NPE if BT device is changed by framework." into udc-dev am: 5576947555 am: 4d3264553c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23141916

Change-Id: Idf88f139230f8b6cbaa3049e5d28a7febfa52cc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 05:34:25 +00:00