Commit Graph

103930 Commits

Author SHA1 Message Date
SongFerng Wang
9e6d96d4e4 Merge "[BT Broadcast Sink] Add the function for leave and scan QRcode buttons" into tm-dev am: 286682ec8a am: a7af4d2965 am: 07ec013371
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181646

Change-Id: I2c0da225188bd4299fe737987f962f2f8ccecf4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 12:04:47 +00:00
Ayush Sharma
8a8804f2f5 Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816 am: 2f5f7c96d1 am: cf3f2dd11f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207

Change-Id: Ica2b35c11aa7f543c85a4a392d14a0f3b8ed2b83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 12:04:41 +00:00
Ayush Sharma
a8e882ba52 Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816 am: 938200e3a8 am: 1376048722
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207

Change-Id: I2d2e387b5e824db4b45e0ad06dfaba324f3b3fcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 12:04:34 +00:00
SongFerng Wang
6c278e5eef Merge "[BT Broadcast Sink] Add the function for leave and scan QRcode buttons" into tm-dev am: 286682ec8a am: 80c326e316 am: a9b22228bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181646

Change-Id: Ia505498a668d64e36f8d7a171f36cfb584be8197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 12:04:25 +00:00
Ayush Sharma
2c15977b5f Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816 am: 2f5f7c96d1 am: b0aa6420d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207

Change-Id: I98f88bfdd069763359c58fe95e16434812a80c95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 12:04:17 +00:00
SongFerng Wang
07ec013371 Merge "[BT Broadcast Sink] Add the function for leave and scan QRcode buttons" into tm-dev am: 286682ec8a am: a7af4d2965
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181646

Change-Id: I914b401164b1d99098d209a76d773a9c39133529
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 11:38:46 +00:00
Ayush Sharma
cf3f2dd11f Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816 am: 2f5f7c96d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207

Change-Id: Ib8fb1d9225de8c07dc8d36535805aa1461975985
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 11:38:41 +00:00
SongFerng Wang
a9b22228bf Merge "[BT Broadcast Sink] Add the function for leave and scan QRcode buttons" into tm-dev am: 286682ec8a am: 80c326e316
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181646

Change-Id: I87e5c30e2bb0d5bb3c22c4ce6e68759af8adbd4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 11:38:22 +00:00
Ayush Sharma
1376048722 Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816 am: 938200e3a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207

Change-Id: Ic92fb8bfd1fcb7a3cf9252b0036989b834b09af8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 11:38:16 +00:00
Ayush Sharma
b0aa6420d9 Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816 am: 2f5f7c96d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207

Change-Id: I38278d4d0cb469c5f2c0dcb757b690776d8eedfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 11:38:16 +00:00
SongFerng Wang
80c326e316 Merge "[BT Broadcast Sink] Add the function for leave and scan QRcode buttons" into tm-dev am: 286682ec8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181646

Change-Id: If732e278300370c10c61b52e347f79c8d9656a0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 11:10:29 +00:00
Ayush Sharma
2f5f7c96d1 Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207

Change-Id: Ieaafe1022101cc6d66e5e3518846e3c68b71cd24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 11:10:14 +00:00
SongFerng Wang
a7af4d2965 Merge "[BT Broadcast Sink] Add the function for leave and scan QRcode buttons" into tm-dev am: 286682ec8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181646

Change-Id: Id200031fbfb965fb97fe4b87a7bbb820dbf0a970
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 11:09:32 +00:00
Ayush Sharma
938200e3a8 Merge "Move set work lock message from header to footer" into tm-dev am: 6e4579a816
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18140207

Change-Id: Ib944ba6daa832409c6f5ae2b6b3921e4038dea33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 11:08:55 +00:00
SongFerng Wang
286682ec8a Merge "[BT Broadcast Sink] Add the function for leave and scan QRcode buttons" into tm-dev 2022-05-06 11:08:21 +00:00
Arc Wang
4aa255f1ca Merge "Revert "Prevent side channel package installation enumeration"" into tm-dev am: 64b42270ab am: dcf9e31c1b am: 6f41c5de15
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186098

Change-Id: I513325bf996b839bfb6d4d76dfe6153437865218
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 11:02:03 +00:00
Arc Wang
a390786c31 Merge "Revert "Prevent side channel package installation enumeration"" into tm-dev am: 64b42270ab am: 80d5ebdf8d am: 3f5f9aea7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186098

Change-Id: I6e7655f8fd6c725e201cf118242b97c303c68d08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 11:00:36 +00:00
Arc Wang
ec46d36807 Merge "Revert "Prevent side channel package installation enumeration"" into tm-dev am: 64b42270ab am: 80d5ebdf8d am: 61ad24e8c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186098

Change-Id: I72a02c4ef4be1604d36a8547690fc77c0bda9e45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 11:00:18 +00:00
Ayush Sharma
6e4579a816 Merge "Move set work lock message from header to footer" into tm-dev 2022-05-06 10:42:10 +00:00
Arc Wang
6f41c5de15 Merge "Revert "Prevent side channel package installation enumeration"" into tm-dev am: 64b42270ab am: dcf9e31c1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186098

Change-Id: I66da7a73cdbf21fb8e5b33c09ca03c0d0e7b6522
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 10:13:26 +00:00
Arc Wang
3f5f9aea7f Merge "Revert "Prevent side channel package installation enumeration"" into tm-dev am: 64b42270ab am: 80d5ebdf8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186098

Change-Id: Ie3a1dd48763ca274d74e357838dd5b56de3a9730
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 10:13:06 +00:00
Arc Wang
61ad24e8c4 Merge "Revert "Prevent side channel package installation enumeration"" into tm-dev am: 64b42270ab am: 80d5ebdf8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186098

Change-Id: Iedddeba25cbe6364197c84746f219a33dbda8576
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 10:13:04 +00:00
Arc Wang
80d5ebdf8d Merge "Revert "Prevent side channel package installation enumeration"" into tm-dev am: 64b42270ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186098

Change-Id: Iaf4585840b034fed6411e34a793fb57c5176ea30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 09:50:08 +00:00
Arc Wang
dcf9e31c1b Merge "Revert "Prevent side channel package installation enumeration"" into tm-dev am: 64b42270ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186098

Change-Id: I4674ee0f1cea5c695b571055daa9492ef438bc5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 09:48:08 +00:00
Arc Wang
64b42270ab Merge "Revert "Prevent side channel package installation enumeration"" into tm-dev 2022-05-06 09:24:42 +00:00
Arc Wang
358dd2b494 Revert "Prevent side channel package installation enumeration"
This reverts commit 263592e3dd.

Reason for revert: <To fix test breaks b/231461076 & 231164585>

Bug: b/231461076
Bug: b/231164585
Change-Id: I29211e5de9d7edef8c61125b8be047b6247c8773
2022-05-06 04:07:50 +00:00
Yi-Ling Chuang
84732065cf Merge "Show previous query upon configuration change" into tm-dev am: 9a14f087cd am: dd6dd8ad13 am: e6501e1249
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158875

Change-Id: Id9f156bc8719c772251b3595d7ffd6f762185f20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 04:07:02 +00:00
Yi-Ling Chuang
e2db0ca0a0 Merge "Show previous query upon configuration change" into tm-dev am: 9a14f087cd am: 0fddcd3f80 am: efbd45873b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158875

Change-Id: I29c07f3489be22a08338192a52be5ca860d7b9fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 04:06:48 +00:00
Yi-Ling Chuang
9be24d9bd5 Merge "Show previous query upon configuration change" into tm-dev am: 9a14f087cd am: 0fddcd3f80 am: db73382e8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158875

Change-Id: I9877cc5198d934b89d5aeda83911e1bb4ff3f6c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 04:06:22 +00:00
Yi-Ling Chuang
e6501e1249 Merge "Show previous query upon configuration change" into tm-dev am: 9a14f087cd am: dd6dd8ad13
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158875

Change-Id: I20f17879e46c24444d45f93853cd46ee58ad0947
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 03:53:47 +00:00
Yi-Ling Chuang
db73382e8b Merge "Show previous query upon configuration change" into tm-dev am: 9a14f087cd am: 0fddcd3f80
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158875

Change-Id: I69ffdeda8f6accb6557395e4725a45aa2d1b2aa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 03:53:27 +00:00
Yi-Ling Chuang
efbd45873b Merge "Show previous query upon configuration change" into tm-dev am: 9a14f087cd am: 0fddcd3f80
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158875

Change-Id: I5656707b6503997d9cd05589bb4c51d8cc113101
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 03:53:22 +00:00
Yi-Ling Chuang
0fddcd3f80 Merge "Show previous query upon configuration change" into tm-dev am: 9a14f087cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158875

Change-Id: I2802a6770e187e6ac8d2f76286f0ffa0ee5adac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 03:33:57 +00:00
Yi-Ling Chuang
dd6dd8ad13 Merge "Show previous query upon configuration change" into tm-dev am: 9a14f087cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158875

Change-Id: I5e72367a25b57f91014bf983289019a399b53792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 03:33:03 +00:00
TreeHugger Robot
02ddc3c758 Merge "Fix Learn more link not work" into tm-dev am: b2dd7913c0 am: 01afe2287f am: a3986ac0f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181642

Change-Id: I4a6f3ed44aa5996346d985dcfd2404850d390250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 03:17:32 +00:00
TreeHugger Robot
d6f947ea66 Merge "Fix Learn more link not work" into tm-dev am: b2dd7913c0 am: a64b3585c2 am: a636c1e104
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181642

Change-Id: I9683edf17b64bcbd8a75a35c156289375e0b5100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 03:17:25 +00:00
Yi-Ling Chuang
9a14f087cd Merge "Show previous query upon configuration change" into tm-dev 2022-05-06 03:17:22 +00:00
TreeHugger Robot
676d56a3a6 Merge "Fix Learn more link not work" into tm-dev am: b2dd7913c0 am: a64b3585c2 am: 1d27f67bfb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181642

Change-Id: Iaf9cfaeab21014cd257d3e2cfd0abb73ad8f7a74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 03:17:06 +00:00
TreeHugger Robot
a3986ac0f8 Merge "Fix Learn more link not work" into tm-dev am: b2dd7913c0 am: 01afe2287f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181642

Change-Id: Ie068ae597e35f38f168586189efca34f88843a77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 03:00:51 +00:00
TreeHugger Robot
1d27f67bfb Merge "Fix Learn more link not work" into tm-dev am: b2dd7913c0 am: a64b3585c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181642

Change-Id: I2bf19dba3f1361116735868b8452c72cf7069293
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 03:00:47 +00:00
TreeHugger Robot
a636c1e104 Merge "Fix Learn more link not work" into tm-dev am: b2dd7913c0 am: a64b3585c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181642

Change-Id: I4da85f0178f60d6fb9c692e900f25bb333c1f8a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 03:00:47 +00:00
TreeHugger Robot
a64b3585c2 Merge "Fix Learn more link not work" into tm-dev am: b2dd7913c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181642

Change-Id: I7830bae523e7fe0464af2c4ff821c87e46ca4a22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 02:42:35 +00:00
TreeHugger Robot
01afe2287f Merge "Fix Learn more link not work" into tm-dev am: b2dd7913c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181642

Change-Id: Ieb6aa225ddbae799d999bb018e659d7514bf014d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 02:41:16 +00:00
TreeHugger Robot
b2dd7913c0 Merge "Fix Learn more link not work" into tm-dev 2022-05-06 02:27:19 +00:00
David Coffin
1bd7090158 Merge "Add PRIVACY_ADVANCED_SETTINGS intent" into tm-dev am: bf2bec34e0 am: e65b3bda30 am: 55f64671d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181704

Change-Id: Icd722863066c0d624925b993e0fc3b0d1447577e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 22:03:58 +00:00
Automerger Merge Worker
49d343f751 Merge "Merge "Add PRIVACY_ADVANCED_SETTINGS intent" into tm-dev am: bf2bec34e0 am: b457d2197d" into tm-d1-dev-plus-aosp am: ac033fe4cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181704

Change-Id: I48c4de326cac6dc82552f5aa0dac7a1748798d27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 21:52:19 +00:00
David Coffin
0b864a1874 Merge "Add PRIVACY_ADVANCED_SETTINGS intent" into tm-dev am: bf2bec34e0 am: e65b3bda30 am: a3b50a149b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181704

Change-Id: I186c122f760b210f4f64e7742bd6cbde3e72b43b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 21:51:20 +00:00
Automerger Merge Worker
ac033fe4cc Merge "Merge "Add PRIVACY_ADVANCED_SETTINGS intent" into tm-dev am: bf2bec34e0 am: b457d2197d" into tm-d1-dev-plus-aosp 2022-05-05 21:28:47 +00:00
David Coffin
0104f06058 Merge "Add PRIVACY_ADVANCED_SETTINGS intent" into tm-dev am: bf2bec34e0 am: b457d2197d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181704

Change-Id: Iab6c29143024f80c4af35ab0afbdf1b29e0c3d71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 21:28:39 +00:00
David Coffin
a3b50a149b Merge "Add PRIVACY_ADVANCED_SETTINGS intent" into tm-dev am: bf2bec34e0 am: e65b3bda30
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181704

Change-Id: I709c8f674ac7059375a712c2a97c27aa3601c0db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 21:28:32 +00:00