Hieu Dang
420a8474db
Merge "Show Bluetooth dialog in a specific case" am: e1e657dac3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2424645
Change-Id: I9e231ac0e16c8e8217be53cc89335758b14be6a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-14 02:02:08 +00:00
Hieu Dang
e1e657dac3
Merge "Show Bluetooth dialog in a specific case"
2023-02-14 01:55:09 +00:00
Jakub Rotkiewicz
bd2f353f8b
Merge "SnoopLogger: Debug enhancements added settings" am: cfde422f91
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2362495
Change-Id: I3c138106ebdaaf6b5597c6a79054915a04098117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-13 13:35:37 +00:00
Jakub Rotkiewicz
cfde422f91
Merge "SnoopLogger: Debug enhancements added settings"
2023-02-13 13:01:01 +00:00
Jakub Rotkiewicz
5a1b8a11a6
SnoopLogger: Debug enhancements added settings
...
Bug: 247859568
Tag: #feature
Test: make RunSettingsRoboTests3
Test: make RunSettingsRoboTests4
Change-Id: I132a1558ea67400d9c10dda523456f99eb815b92
Merged-In: I132a1558ea67400d9c10dda523456f99eb815b92
2023-02-13 11:35:55 +00:00
My Name
2e552331e9
Show Bluetooth dialog in a specific case
...
If the application that initiate the bonding with
BluetoothDevice#createBond is in foreground, then should dialog only
instead of showing the notification & dialog
Bug: 175931562
Tag: #refactor
Test: manual
Change-Id: I3673a0b58cbf9caabf62c951b84b49e17cfb13b8
2023-02-10 08:31:34 +00:00
Treehugger Robot
016f304b8d
Merge "Merge TQ1A.230205.002" am: 0a9affaaab
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2423108
Change-Id: I4147301439d6f88a08a8fa0f3b78cb5c9dd13f70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-08 18:13:26 +00:00
Treehugger Robot
0a9affaaab
Merge "Merge TQ1A.230205.002"
2023-02-08 10:40:37 +00:00
Xin Li
c660135971
Merge TQ1A.230205.002
...
Bug: 263898609
Merged-In: I13562d227e06627fac33239a9d21fd405a18d012
Change-Id: I1457d9362378bd893f557e1c998308cf8ee8904a
2023-02-06 21:05:31 -08:00
Patrick Rohr
ac83ccd34f
Merge "Enable ethernet data usage when FEATURE_USB_HOST is present" am: b0ddc1833d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2420579
Change-Id: If7bf40d49a67c14a62e4db7994995dac9b86fb3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 18:15:21 +00:00
Patrick Rohr
b0ddc1833d
Merge "Enable ethernet data usage when FEATURE_USB_HOST is present"
2023-02-03 17:28:34 +00:00
Patrick Rohr
d2d340146e
Enable ethernet data usage when FEATURE_USB_HOST is present
...
Ethernet is enabled when either FEATURE_ETHERNET *or* FEATURE_USB_HOST
is present. See ConnectivityService#deviceSupportsEthernet.
ConnectivityService#deviceSupportsEthernet should really be moved to
some commonly accessible location.
Test: TH
Change-Id: I497d99169248db7e5948b3a19134ab42e66d5b9b
2023-02-03 03:32:02 +00:00
Treehugger Robot
b6050b438d
Merge "Fixes resource file exemption." am: 888759dd9f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2395652
Change-Id: I36b5629352f9dcff89dc387e50e77d1eed083ad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-30 21:36:22 +00:00
Treehugger Robot
888759dd9f
Merge "Fixes resource file exemption."
2023-01-30 20:28:12 +00:00
Treehugger Robot
f706f0fc0f
Merge "Add mtv engineers to owners for emergency code reviews" am: 3272025234
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2404300
Change-Id: I50416ec05b1f205986f48fa3635190ec9f48a64d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-27 20:25:55 +00:00
Treehugger Robot
3272025234
Merge "Add mtv engineers to owners for emergency code reviews"
2023-01-27 19:21:59 +00:00
Yang Lu
b9862e79df
Add mtv engineers to owners for emergency code reviews
...
Change-Id: I440120397c11b8ebce617649c700b63dbca30ee8
Test: N/A
2023-01-27 05:21:25 +00:00
Treehugger Robot
1d7192e9f6
Merge "Fix NullPointerException when renaming a fingerprint" am: 5f27701d95
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2402034
Change-Id: I4f2e99ebcb887b0203fcb7bb915968b4acd11f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-25 02:15:02 +00:00
Treehugger Robot
5f27701d95
Merge "Fix NullPointerException when renaming a fingerprint"
2023-01-25 01:39:07 +00:00
Ilya Matyukhin
67d47f6b4a
Fix NullPointerException when renaming a fingerprint
...
(Original change made by xingbin.feng@sony.com )
Fix NullPointerException when rotating the screen while renaming
a registered fingerprint
Bug: 236873593
Test: Click a registered fingerprint to open the Rename dialog,
rotate the device and press OK. Verify that Settings does not
crash
Change-Id: I1350c4bd121e0a7aaa291b3b8f96c80ef777150b
2023-01-24 23:55:29 +00:00
Treehugger Robot
3e1e67aa9c
Merge "Update OWNER list" am: f846e5cf0e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2396592
Change-Id: I2d2cc997c8a01a42d4147029fe71e706a05b3daf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-20 07:35:43 +00:00
Treehugger Robot
f846e5cf0e
Merge "Update OWNER list"
2023-01-20 06:53:33 +00:00
Yanting Yang
5c959d8610
Update OWNER list
...
Test: N/A
Change-Id: Ibb67601aa44b690fd4ac3016329277f8cb89be64
Merged-In: I9ab91f21558513b85847d9c513e7d50f9486c6ea
2023-01-20 05:06:37 +00:00
Daniel Norman
f86a0718b0
Fixes resource file exemption.
...
The previous version missed out on other file types (JSON motion files, mp4, etc.)
Change-Id: I2d1846ff1ab2461fe0c3716b02d1a323cb8af85b
2023-01-19 19:37:01 +00:00
Betty Chang
c985a6d47d
Merge "[LE Audio] To add the vibrate when the scan is successful" am: d7e16c22f6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2385039
Change-Id: I92615d5cc7a8605458d78082b45b339234ea52e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-13 11:58:35 +00:00
Betty Chang
d7e16c22f6
Merge "[LE Audio] To add the vibrate when the scan is successful"
2023-01-13 10:34:12 +00:00
changbetty
ca475a5d37
[LE Audio] To add the vibrate when the scan is successful
...
Bug: 242023882
Test: manual test
Change-Id: Iabff5fb81e307222fb33541e4bf0008830321d3e
2023-01-13 02:30:23 +00:00
Xin Li
5482fb0301
Merge tm-qpr-dev-plus-aosp-without-vendor@9467136
...
Bug: 264720040
Merged-In: Ic8d9f286c53e321a933d98f9c05bbc6bb8bf98f0
Change-Id: I2f32b289ee96a205816ed48e8f4490d081a0d315
2023-01-11 22:47:24 -08:00
Treehugger Robot
9c8ff84746
Merge "Amend "Reset notification importance" list item style" am: aef592eb18
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2382194
Change-Id: Ife8b88093010ff9fea43758057d334bbea50540a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-11 11:19:53 +00:00
Treehugger Robot
aef592eb18
Merge "Amend "Reset notification importance" list item style"
2023-01-11 10:31:55 +00:00
Shen Lin
1721d0f276
Amend "Reset notification importance" list item style
...
Using LayoutPreference here makes list look like abrupt, we would like
to switch to normal Preference to align listitem style.
Bug: 265062898
Test: atest ImportanceResetPreferenceControllerTest -c
Change-Id: I93961de148915699d2cba46bdba71e667e8ea10a
2023-01-11 05:21:59 +00:00
Betty Chang
f0b70510d8
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Change the intent flag to immutable" into tm-dev am: 145d91b832
am: ddeff2f67f
-s ours am: 30783964b3
-s ours
...
am skip reason: Merged-In I68132f863027fab19351b4fdbc363e5c274e3327 with SHA-1 09a6899fc2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20844713
Change-Id: I292f88e40c9e6228dd6395fa6f6be4cf896ce4c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-07 09:09:10 +00:00
changbetty
3afa2f08f2
[automerger skipped] [RESTRICT AUTOMERGE] Change the intent flag to immutable am: 0dcd6a5492
am: 7888fcc82b
-s ours am: e7f0596113
-s ours
...
am skip reason: Merged-In I68132f863027fab19351b4fdbc363e5c274e3327 with SHA-1 09a6899fc2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20844713
Change-Id: Id7b72ef1e840e8c401d5167691d892fc54fa56de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-07 09:09:06 +00:00
Betty Chang
30783964b3
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Change the intent flag to immutable" into tm-dev am: 145d91b832
am: ddeff2f67f
-s ours
...
am skip reason: Merged-In I68132f863027fab19351b4fdbc363e5c274e3327 with SHA-1 09a6899fc2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20844713
Change-Id: I0fbd5e7104445bc1f4176c56522b335870b1c7cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-07 08:39:48 +00:00
changbetty
e7f0596113
[automerger skipped] [RESTRICT AUTOMERGE] Change the intent flag to immutable am: 0dcd6a5492
am: 7888fcc82b
-s ours
...
am skip reason: Merged-In I68132f863027fab19351b4fdbc363e5c274e3327 with SHA-1 09a6899fc2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20844713
Change-Id: I6c0fb65c5ce73586624b75929a6992bc3a58a4bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-07 08:39:46 +00:00
Betty Chang
ddeff2f67f
Merge "[RESTRICT AUTOMERGE] Change the intent flag to immutable" into tm-dev am: 145d91b832
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20844713
Change-Id: I66295604e4413f7c6d9a1067abeab07b14eeae63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-07 08:01:20 +00:00
changbetty
7888fcc82b
[RESTRICT AUTOMERGE] Change the intent flag to immutable am: 0dcd6a5492
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20844713
Change-Id: I3b67d30e794dd06a689c57c9fd6b948bbea362f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-07 08:01:18 +00:00
Yanting Yang
ab4cd3acdf
[automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 86914bedc8
-s ours am: 6326f5e65a
-s ours am: a617639496
-s ours am: 8c70085bab
-s ours am: b1391d7eb2
-s ours am: b842d569bf
-s ours am: 618af44b70
-s ours am: d0c69f7ae7
-s ours
...
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 1a43a98334
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871685
Change-Id: I49a24450f1b28aa4e0767757a9e8eaabb5f3aab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-07 07:57:50 +00:00
Betty Chang
9cb6a08d16
Merge "Change the intent flag to immutable" into tm-qpr-dev am: cfc1569f12
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20802849
Change-Id: Iaf38ffd1366880869dfb9bbda3e9e57aea337b2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-07 07:57:39 +00:00
Yanting Yang
d0c69f7ae7
[automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 86914bedc8
-s ours am: 6326f5e65a
-s ours am: a617639496
-s ours am: 8c70085bab
-s ours am: b1391d7eb2
-s ours am: b842d569bf
-s ours am: 618af44b70
-s ours
...
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 1a43a98334
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871685
Change-Id: I87141bf0fba2bd6b66fe0fa59377138271e0576f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-07 07:24:10 +00:00
Betty Chang
145d91b832
Merge "[RESTRICT AUTOMERGE] Change the intent flag to immutable" into tm-dev
2023-01-07 07:23:30 +00:00
Betty Chang
cfc1569f12
Merge "Change the intent flag to immutable" into tm-qpr-dev
2023-01-07 07:23:02 +00:00
Yanting Yang
618af44b70
[automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 86914bedc8
-s ours am: 6326f5e65a
-s ours am: a617639496
-s ours am: 8c70085bab
-s ours am: b1391d7eb2
-s ours am: b842d569bf
-s ours
...
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 1a43a98334
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871685
Change-Id: Ida9886743b149f43cab923e5f56778065e7e04b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-07 06:49:11 +00:00
Yanting Yang
b01c6e3525
[automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 1a43a98334
-s ours am: 3594b1e412
-s ours am: f3d990e36d
-s ours am: 9038a26635
-s ours am: 36a4373792
-s ours am: 0e2bf4c870
-s ours am: 7396023ddb
-s ours
...
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 16500a7ada
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871703
Change-Id: I1330dd790442b749e6ca919284f02446e85ca813
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-07 06:08:17 +00:00
Yanting Yang
b842d569bf
[automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 86914bedc8
-s ours am: 6326f5e65a
-s ours am: a617639496
-s ours am: 8c70085bab
-s ours am: b1391d7eb2
-s ours
...
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 1a43a98334
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871685
Change-Id: I4160c9fba6190b73af1d9b18ce90975b99eb38e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-07 06:08:06 +00:00
Yanting Yang
a25b0242a4
[automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 16500a7ada
-s ours am: 1b30190fe1
-s ours am: adc9a200ac
-s ours am: 46c8caa6cc
-s ours am: b2943c3888
-s ours am: fac442ae58
-s ours
...
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 0616b484e9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20872582
Change-Id: Ie4f7da8a7c35d5e0310964af09b023491d8c22c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-07 06:08:03 +00:00
Yanting Yang
7396023ddb
[automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 1a43a98334
-s ours am: 3594b1e412
-s ours am: f3d990e36d
-s ours am: 9038a26635
-s ours am: 36a4373792
-s ours am: 0e2bf4c870
-s ours
...
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 16500a7ada
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871703
Change-Id: I4c5ba7e1963c08e7d695fb86bca0fdcbd61c67e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-07 05:36:40 +00:00
Yanting Yang
b1391d7eb2
[automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 86914bedc8
-s ours am: 6326f5e65a
-s ours am: a617639496
-s ours am: 8c70085bab
-s ours
...
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 1a43a98334
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871685
Change-Id: I17851351e33f65ae9ae187114fe73358c0dfecc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-07 05:36:33 +00:00
Yanting Yang
fac442ae58
[automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 16500a7ada
-s ours am: 1b30190fe1
-s ours am: adc9a200ac
-s ours am: 46c8caa6cc
-s ours am: b2943c3888
-s ours
...
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 0616b484e9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20872582
Change-Id: I12feb4c19f82efcbb56b23925abb0ab6712a31ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-07 05:36:31 +00:00
Yanting Yang
0e2bf4c870
[automerger skipped] Add DISALLOW_APPS_CONTROL check into uninstall app for all users am: 1a43a98334
-s ours am: 3594b1e412
-s ours am: f3d990e36d
-s ours am: 9038a26635
-s ours am: 36a4373792
-s ours
...
am skip reason: Merged-In I5d3bbcbaac439c4f7a1e6a9ade7775ff4f2f2ec6 with SHA-1 16500a7ada
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20871703
Change-Id: I6b2e3322b8f8a77ab8662d357c0aa3883872207d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-07 05:06:03 +00:00