TreeHugger Robot
935fbe577e
Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev am: f39872bc18
am: 0fa209b89c
am: b53549a4c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234991
Change-Id: Ifed5031af5d1b50160d337daccb1ee1ddc1acf38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 04:21:54 +00:00
TreeHugger Robot
b53549a4c5
Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev am: f39872bc18
am: 0fa209b89c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234991
Change-Id: Ib7e0937ab4ae2e61664e69054d4f3db5ab91312a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 04:07:40 +00:00
TreeHugger Robot
0fa209b89c
Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev am: f39872bc18
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234991
Change-Id: I683531b19121643ea5000d3bdd4344d0c7c9cfd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 03:38:59 +00:00
TreeHugger Robot
f39872bc18
Merge "Make bluetooth not discoverable via SliceDeepLinkTrampoline" into tm-dev
2022-05-11 03:02:52 +00:00
Qasim Javed
01f4cbf40a
Merge "Only cancel bonding if pair button is not pressed" into tm-dev am: 94a97b6c59
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18285591
Change-Id: I5f2a7771c8078684aac2346ca8c1c0da5c1b59d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 01:45:59 +00:00
Jack He
939e53fda2
Merge "Only cancel bonding if pair button is not pressed" am: 33a080ad7a
am: 55da62f36e
am: 272eedba22
am: a79435beb5
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2093951
Change-Id: I138d002b88bdd06e88c9fd3ebf46a0b7c19c4954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 00:15:49 +00:00
Treehugger Robot
976d920650
Merge "Disable "SIM card lock" when the SIM card is PUK-blocked" am: ab8bdb2bdb
am: 4a0d0f29f3
am: 9bd8bec2df
am: 1543eff3c2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2076379
Change-Id: I2bf82109e104c1dfcd6656f086b2c8e9851c4a8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-11 00:15:37 +00:00
Jack He
a79435beb5
Merge "Only cancel bonding if pair button is not pressed" am: 33a080ad7a
am: 55da62f36e
am: 272eedba22
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2093951
Change-Id: If8f0a915f938ddf220e51af43b633a252626454b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 23:34:35 +00:00
Treehugger Robot
1543eff3c2
Merge "Disable "SIM card lock" when the SIM card is PUK-blocked" am: ab8bdb2bdb
am: 4a0d0f29f3
am: 9bd8bec2df
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2076379
Change-Id: I107f2dda84bf0b9c63ad043d2cd4b87425375f17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 23:34:29 +00:00
Jack He
272eedba22
Merge "Only cancel bonding if pair button is not pressed" am: 33a080ad7a
am: 55da62f36e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2093951
Change-Id: Ie406b8c9f37091934ad1641524ec40492b654113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 23:16:45 +00:00
Treehugger Robot
9bd8bec2df
Merge "Disable "SIM card lock" when the SIM card is PUK-blocked" am: ab8bdb2bdb
am: 4a0d0f29f3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2076379
Change-Id: I5314d3f9e5201402a377cf7e61e36994a933f5bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 23:16:36 +00:00
Jack He
55da62f36e
Merge "Only cancel bonding if pair button is not pressed" am: 33a080ad7a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2093951
Change-Id: I9d47c60b9588236b7923a33b3c1183b60896f0e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 22:56:57 +00:00
Treehugger Robot
4a0d0f29f3
Merge "Disable "SIM card lock" when the SIM card is PUK-blocked" am: ab8bdb2bdb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2076379
Change-Id: I5bb8460443557bdca8d23bae54353c4b1dee548d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 22:56:40 +00:00
Jack He
56b5fa0fb1
Merge "Cancel bonding upon back gesture." am: 3671fb8438
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2093046
Change-Id: I234953b29f4fb02af845243cce3131267acbf6a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 22:56:31 +00:00
Jack He
33a080ad7a
Merge "Only cancel bonding if pair button is not pressed"
2022-05-10 21:47:29 +00:00
TreeHugger Robot
bfeff3bfc6
Merge "Hide running time for "Android System" in the optimization page" into tm-dev am: 10190793fe
am: ccd8147776
am: 435a8ae837
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234990
Change-Id: Ibc8f16ad8dc14b91f2856108e6db82bc7925fd45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:30:37 +00:00
Bonian Chen
9370dcd84d
Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev am: 812de51467
am: 33bc83f19e
am: c8433b8435
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18231805
Change-Id: I4a1dda519fb7522703cf217d6ec00b8ee2ec37eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:29:30 +00:00
Yanting Yang
f79c8af9dc
Merge "Fix reset app preferences for work profile apps" into tm-dev am: 51204e3deb
am: 7031c01a9c
am: 604c3c3f22
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234983
Change-Id: Ibc647906b3961bd9c3d703de990c08266dba5f2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:20:23 +00:00
Martijn Coenen
c696bdbaa4
Merge "Add SDK sandbox network usage to corresponding apps." into tm-dev am: 63db54c290
am: cf79b0fcf0
am: ffef837a93
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944004
Change-Id: I2bfcae49748ec67f73e1582cbd94a81a36e599db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:20:17 +00:00
Tsung-Mao Fang
984cbd60ba
Merge "Disable setting items in App details page" into tm-dev am: ca72e5c333
am: 4e09433546
am: 551d742d83
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18178967
Change-Id: Ia7c2fa6739d2b424601ef0f9d637095af7c91836
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:19:26 +00:00
TreeHugger Robot
22e20f3d18
Merge "Cancel bonding upon back gesture." into tm-dev am: 3dcb2b65f7
am: 31b30c123c
am: 241baf7389
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18236995
Change-Id: I62261e6f9143b1de9d2c2f5181fda2447a4b226f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:18:49 +00:00
SongFerng Wang
0331308709
Merge "Reuse the active esim slot" into tm-dev am: b1613b210d
am: 992e20d2af
am: 4f0d8249a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18235422
Change-Id: I8aa5478ca624312e5857be3623f13cc70d87b6e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:18:34 +00:00
TreeHugger Robot
435a8ae837
Merge "Hide running time for "Android System" in the optimization page" into tm-dev am: 10190793fe
am: ccd8147776
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234990
Change-Id: Iaa804c69d8744a07de575fd57c57eede2ca6a7b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:06:33 +00:00
Bonian Chen
c8433b8435
Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev am: 812de51467
am: 33bc83f19e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18231805
Change-Id: I979f44db2bc52cdef0b1e48a88457856a10cfda5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:06:04 +00:00
Yanting Yang
604c3c3f22
Merge "Fix reset app preferences for work profile apps" into tm-dev am: 51204e3deb
am: 7031c01a9c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234983
Change-Id: Ib554be5157dd5cb5d39902eb75b71fa2490d62df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:04:09 +00:00
Martijn Coenen
ffef837a93
Merge "Add SDK sandbox network usage to corresponding apps." into tm-dev am: 63db54c290
am: cf79b0fcf0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944004
Change-Id: Id7e7b020df7b7ba22e82bf80ac1b541d915ca48c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:03:14 +00:00
Tsung-Mao Fang
551d742d83
Merge "Disable setting items in App details page" into tm-dev am: ca72e5c333
am: 4e09433546
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18178967
Change-Id: Id8befe820b0df6bf057e952f56cc66a3d52ae4f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:01:50 +00:00
TreeHugger Robot
241baf7389
Merge "Cancel bonding upon back gesture." into tm-dev am: 3dcb2b65f7
am: 31b30c123c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18236995
Change-Id: Iceff0b60a1a44cee4c18bc8145f69ee98877a979
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:01:30 +00:00
SongFerng Wang
4f0d8249a9
Merge "Reuse the active esim slot" into tm-dev am: b1613b210d
am: 992e20d2af
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18235422
Change-Id: Ic6fe5a86bf53a1dc67100152dd30199d4d2b97df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 21:01:15 +00:00
TreeHugger Robot
7e3c63dcd5
Merge "Hide running time for "Android System" in the optimization page" into tm-dev am: 10190793fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234990
Change-Id: I550583e2fa4ba4c113760ca41caee4f499d76929
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:33:52 +00:00
Bonian Chen
2a1040e1e2
Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev am: 812de51467
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18231805
Change-Id: I1a7d0cd2e38b39da2b1873b2cb6161d5a50abb45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:33:40 +00:00
Yanting Yang
799f7218cd
Merge "Fix reset app preferences for work profile apps" into tm-dev am: 51204e3deb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234983
Change-Id: I4875344328bc68d8ca069ed15f71aa8ce4abef8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:33:30 +00:00
Martijn Coenen
d77f3426a2
Merge "Add SDK sandbox network usage to corresponding apps." into tm-dev am: 63db54c290
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944004
Change-Id: I6e942c241c734314246623b7521af6ebf9d2896c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:33:13 +00:00
TreeHugger Robot
ccd8147776
Merge "Hide running time for "Android System" in the optimization page" into tm-dev am: 10190793fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234990
Change-Id: Iba2eb763ef4599ad0073c024828a5ecffdfee8ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:31:31 +00:00
Bonian Chen
33bc83f19e
Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev am: 812de51467
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18231805
Change-Id: I44235c6398195e24682857ccf5b292b4947e4b91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:31:23 +00:00
Yanting Yang
7031c01a9c
Merge "Fix reset app preferences for work profile apps" into tm-dev am: 51204e3deb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234983
Change-Id: I63a74eece6489253bc76c2578c125f1f6e2451fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:31:16 +00:00
Martijn Coenen
cf79b0fcf0
Merge "Add SDK sandbox network usage to corresponding apps." into tm-dev am: 63db54c290
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944004
Change-Id: I033f09aaf7800e383de7a769b2e269b3ecf1c8a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:31:08 +00:00
Tsung-Mao Fang
7e6dd3f4b7
Merge "Disable setting items in App details page" into tm-dev am: ca72e5c333
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18178967
Change-Id: I97fb5d351bea43b6e7210bb856cd5c89d4ddc3af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:26:40 +00:00
TreeHugger Robot
24a2986cfa
Merge "Cancel bonding upon back gesture." into tm-dev am: 3dcb2b65f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18236995
Change-Id: I8cebf257ad475a63577b0adae5e23c89b65bfe2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:26:10 +00:00
SongFerng Wang
2c7794515d
Merge "Reuse the active esim slot" into tm-dev am: b1613b210d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18235422
Change-Id: I4be1c5c74c1a64b17e8fb6903ccc3aee0e962c81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:25:43 +00:00
Tsung-Mao Fang
4e09433546
Merge "Disable setting items in App details page" into tm-dev am: ca72e5c333
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18178967
Change-Id: I81bf6663ec88a1de1578a38317031cdec9b912ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:24:05 +00:00
TreeHugger Robot
31b30c123c
Merge "Cancel bonding upon back gesture." into tm-dev am: 3dcb2b65f7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18236995
Change-Id: I21114cb9c3a52a23854f836a120b812f94c923ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:23:18 +00:00
SongFerng Wang
992e20d2af
Merge "Reuse the active esim slot" into tm-dev am: b1613b210d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18235422
Change-Id: I64749537cb7fa639c7ce6dd1ed76e15a0a969cf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 20:22:41 +00:00
Qasim Javed
29b7f1d5fa
Only cancel bonding if pair button is not pressed
...
aosp/2093046 cancels bonding unconditionally in onDestroy(), this
results in the user not being able to pair when the pair button is
pressed because onDestroy() is also called in that case.
Only cancel bonding if the user did not press the pair button.
Bug: 231554812
Test: Changed settings app is able to scan after dismissing the dialog
and is also able to pair when the pair button is pressed
Change-Id: I868af9b795f1bb0766656e4619bd06dc8028008a
Merged-In: I868af9b795f1bb0766656e4619bd06dc8028008a
2022-05-10 12:03:33 -07:00
Qasim Javed
419b7fa289
Only cancel bonding if pair button is not pressed
...
aosp/2093046 cancels bonding unconditionally in onDestroy(), this
results in the user not being able to pair when the pair button is
pressed because onDestroy() is also called in that case.
Only cancel bonding if the user did not press the pair button.
Bug: 231554812
Test: Changed settings app is able to scan after dismissing the dialog
and is also able to pair when the pair button is pressed
Change-Id: I868af9b795f1bb0766656e4619bd06dc8028008a
2022-05-10 11:29:28 -07:00
TreeHugger Robot
10190793fe
Merge "Hide running time for "Android System" in the optimization page" into tm-dev
2022-05-10 13:41:55 +00:00
Chaohui Wang
02ddd9a642
Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 9b28ecf9de
am: 80e74b7f0f
am: 22bdda8861
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799715
Change-Id: I6bfd3464f77a215a541aeb64526f614b5088dbfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 12:50:58 +00:00
Bonian Chen
09efd55ebb
Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev am: bd971968e9
am: 4c3dda2bbd
am: 91a2f3c2a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131632
Change-Id: I4fabf12c79d4ef7ed3ce927a75d50739b97eb20a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-10 12:50:43 +00:00
Bonian Chen
812de51467
Merge "[Settings] Hide some Preference entries when no mobile data support" into tm-dev
2022-05-10 12:35:30 +00:00
Yanting Yang
51204e3deb
Merge "Fix reset app preferences for work profile apps" into tm-dev
2022-05-10 12:25:59 +00:00