Automerger Merge Worker
b98e4f8c85
Merge changes from topic "am-6a80ad22a95146729ffb32509025cb72" into tm-d1-dev-plus-aosp am: 16fa021560
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 98e3bfdebb
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I80ae957243e9b35002bb22b88d42cf9130f7fd98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-29 00:11:26 +00:00
TreeHugger Robot
459fb0b5a1
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev am: 7429f710f7
-s ours am: 3a28ab401b
-s ours am: 04041d515c
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I3d062738cd130ae8a8eed2dc52ab8b21a242bb16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-29 00:11:21 +00:00
TreeHugger Robot
dbf2abbc34
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev am: 80f5fd3836
-s ours am: 785e311159
-s ours am: f2f310cdf1
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I7fc4fa7a292b42925d1513419aecacb03451a982
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:56:38 +00:00
Milton Wu
c67009349d
[automerger skipped] [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
am: 3f02770332
-s ours am: fcffcdd692
-s ours am: 34d43eb70f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I8044661be70d553e25fdcf3aa423af92c0feda5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:56:37 +00:00
TreeHugger Robot
e9c3d6d456
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev am: 7429f710f7
-s ours am: 4f3cd58c02
-s ours am: 4840155935
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I4ef3ec259a7abe96374401f2ea8f199cb266f43c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:56:18 +00:00
Milton Wu
d3f7bdbed9
[automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
2p: 353e941920
am: 9e76d2c1fb
-s ours am: 14584ec665
-s ours am: b23f6838de
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: If0ce11df4f8b0766dd141e2dbcacb2523e43c7ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:56:16 +00:00
TreeHugger Robot
6cc1b77003
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev am: 80f5fd3836
-s ours am: 785e311159
-s ours am: f2f310cdf1
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I9b490c272aca991383f2a2d65f963ee33ac105b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:55:39 +00:00
Milton Wu
a8431fcaf6
[automerger skipped] [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
am: 3f02770332
-s ours am: fcffcdd692
-s ours am: 34d43eb70f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: Ie3037847e57182ec94131b73c35e7cfe4b0e204a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:55:38 +00:00
TreeHugger Robot
a823a034fa
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev am: 7429f710f7
-s ours am: 4f3cd58c02
-s ours am: 240745ee63
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I6a6e4c1ca0e34c58be6a7cb397364de5c387b579
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:54:41 +00:00
Milton Wu
f1e7e8ff81
[automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
2p: 353e941920
am: 9e76d2c1fb
-s ours am: 14584ec665
-s ours am: d9cc9813c3
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: Ia0d1ce6d2180c737f9190b98040db8c4b592f3b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:54:36 +00:00
TreeHugger Robot
6a6678facd
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev am: 80f5fd3836
-s ours am: 785e311159
-s ours am: f2f310cdf1
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I0d7b3e60ee881745125ddce0245f3376b9040640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:53:57 +00:00
Milton Wu
b5f2fe917e
[automerger skipped] [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
am: 3f02770332
-s ours am: fcffcdd692
-s ours am: 34d43eb70f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I8bb019a8d0ee5d66d1d07c5561c2ce9c224c713e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:53:52 +00:00
Automerger Merge Worker
16fa021560
Merge changes from topic "am-6a80ad22a95146729ffb32509025cb72" into tm-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev am: 7429f710f7
-s ours am: 3a28ab401b
-s ours
[automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
2p: 353e941920
am: 9e76d2c1fb
-s ours am: 6cfd8c6aa3
-s ours
2022-09-28 23:27:47 +00:00
TreeHugger Robot
04041d515c
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev am: 7429f710f7
-s ours am: 3a28ab401b
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I4501cfd8020c5b0e135ff2374f1e54461493b94c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:27:43 +00:00
Milton Wu
32b02f233d
[automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
2p: 353e941920
am: 9e76d2c1fb
-s ours am: 6cfd8c6aa3
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I6b33dd1e99d83fe4636600f7f2d4934b5ec49c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:27:42 +00:00
TreeHugger Robot
4840155935
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev am: 7429f710f7
-s ours am: 4f3cd58c02
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I955241f19b1fa1b0d012e3a69ce507aa7aaac003
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:27:41 +00:00
Milton Wu
b23f6838de
[automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
2p: 353e941920
am: 9e76d2c1fb
-s ours am: 14584ec665
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I65a751953bfccc8e964b54a070606edd6b290113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:27:39 +00:00
TreeHugger Robot
240745ee63
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev am: 7429f710f7
-s ours am: 4f3cd58c02
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I66012bf2ae40ebe67bb874663b5123867e80700a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:27:38 +00:00
Milton Wu
d9cc9813c3
[automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
2p: 353e941920
am: 9e76d2c1fb
-s ours am: 14584ec665
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I7aa21e8994679c4a90fbc590f2caa080983cb7d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:27:37 +00:00
TreeHugger Robot
49cac6d4a8
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev am: 7429f710f7
-s ours am: 526fe84452
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I7756614d39d0e30fb076bb30d7d85eb886a2561a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:27:10 +00:00
Milton Wu
382b847cb8
[automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
2p: 353e941920
am: 9e76d2c1fb
-s ours am: 68aeb6639b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I78fcc742f40704872967fa46dbaf1e59242d8640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:27:07 +00:00
TreeHugger Robot
f2f310cdf1
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev am: 80f5fd3836
-s ours am: 785e311159
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I26feba1ff77c83e08c57817dd36574b7b7218472
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:24:53 +00:00
Milton Wu
34d43eb70f
[automerger skipped] [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
am: 3f02770332
-s ours am: fcffcdd692
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: Ib0958dfb6feb7edf36142450b8998a079ede6277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 23:24:49 +00:00
TreeHugger Robot
785e311159
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev am: 80f5fd3836
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: Ia4267770be69e08e5e4094a092659b8e1d4625e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 22:59:28 +00:00
Milton Wu
fcffcdd692
[automerger skipped] [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
am: 3f02770332
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I5d4a93f2029eb1ab012fb421874882a5ad699459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 22:59:27 +00:00
TreeHugger Robot
4f3cd58c02
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev am: 7429f710f7
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I158405e4b86b56d57116e838b6454984f2cdf13f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 22:59:25 +00:00
Milton Wu
14584ec665
[automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
2p: 353e941920
am: 9e76d2c1fb
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I8c364167356ffcd830c14644f0bbd39da6730bdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 22:59:24 +00:00
TreeHugger Robot
526fe84452
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev am: 7429f710f7
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I088200b7e34a0075828ef2cb5251ef1be22839c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 22:58:28 +00:00
Milton Wu
68aeb6639b
[automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
2p: 353e941920
am: 9e76d2c1fb
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I6c346ba06234fb12dd71d281432d97711d6c681c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 22:58:26 +00:00
TreeHugger Robot
3a28ab401b
[automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev am: 7429f710f7
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: Idc0a3eff48a1d461253d5609ada7a2f8f1489ccc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 22:56:43 +00:00
Milton Wu
6cfd8c6aa3
[automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
2p: 353e941920
am: 9e76d2c1fb
-s ours
...
am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108b9
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403
Change-Id: I18f043a59751014380a81c8cdd25d71b9c6ff289
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 22:56:40 +00:00
TreeHugger Robot
7429f710f7
Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev
...
* changes:
[automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
2p: 353e941920
[automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern
2022-09-28 22:37:17 +00:00
TreeHugger Robot
80f5fd3836
Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev
...
* changes:
[automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfdebb
[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern
2022-09-28 22:37:17 +00:00
SongFerng Wang
1a53831df1
Merge "Add the way for hiding the "contact sharing" on the pairing dialog" into tm-qpr-dev am: f970d63b3b
am: d57eb2054b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20033811
Change-Id: I9c0d24248c6e67d9c43139fa4668fbd4fc813c77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 20:46:23 +00:00
SongFerng Wang
d57eb2054b
Merge "Add the way for hiding the "contact sharing" on the pairing dialog" into tm-qpr-dev am: f970d63b3b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20033811
Change-Id: Ic22f2dd71f84556397bf44344812aa5fe156c024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 20:09:16 +00:00
SongFerng Wang
f970d63b3b
Merge "Add the way for hiding the "contact sharing" on the pairing dialog" into tm-qpr-dev
2022-09-28 19:45:33 +00:00
Evan Severson
5ba4065703
Make SensorToggleControllers lifecycle aware
...
We need to watch the lifecycle so that we can unregister callbacks and
not cause leaks.
This change also rewrites the SensorPrivacyManagerHelper. The previous
implmementation was using deprecated apis. It also had an issue where
if a callback was added it would not necessarily register alistener with
the callback with the service since that was only done when the value is
checked. Now we register a listener when the class is instantiated and
with the new API there will only be the 1.
Finally we impove the tests to have more coverage and test both
SensorToggleControllers and the SensorPRivacyManagerHelper class.
Test: Use profiler to verify no more leaks
SensorToggleControllerTest, SensorPrivacyManagerHelperTest
Bug: 244280065
Change-Id: Ibf0bcee455444a104ca6800302907c3dc0de8f1f
2022-09-28 11:42:01 -07:00
TreeHugger Robot
b7b554adb2
[automerger skipped] Merge "Restrict Wi-Fi configuration if settings UI is restricted" into tm-qpr-dev am: ee21072a5e
am: e7e1f37321
-s ours
...
am skip reason: Merged-In Id82498f41765f955e01bb311bb221d26f9574f31 with SHA-1 aaa65fc6f0
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20063305
Change-Id: Ia9201564978b983fb1e96ecbfd21213fe564bcf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 18:01:57 +00:00
TreeHugger Robot
e7e1f37321
Merge "Restrict Wi-Fi configuration if settings UI is restricted" into tm-qpr-dev am: ee21072a5e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20063305
Change-Id: I3e4661df4a20415b44390eb6484811e3073e9f58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 17:32:08 +00:00
TreeHugger Robot
ee21072a5e
Merge "Restrict Wi-Fi configuration if settings UI is restricted" into tm-qpr-dev
2022-09-28 16:48:10 +00:00
Xuanang Zhao
82f23fe8df
Merge "Add auto rotation icon resource."
2022-09-28 15:09:55 +00:00
Chaohui Wang
9bad2fd7ac
Add install & clear app button for instant app
...
These 2 buttons are only for instant apps.
Bug: 236346018
Test: App Settings page with Instant App
Change-Id: Ibdb27ff78172a59267c16bdfe5a256353fc91b26
2022-09-28 20:28:41 +08:00
Chaohui Wang
b983d6b4bf
Merge "Update Settings App for SpaEnvironment"
2022-09-28 12:14:48 +00:00
Xuanang Zhao
569932474e
Add auto rotation icon resource.
...
Change-Id: Ica60e4239439b01f1545bae6f1d809e29a4a9033
Bug: 248428429
Test: manual
2022-09-28 17:55:01 +08:00
TreeHugger Robot
a27418931c
Merge "Fix AppInteractAcrossProfilesSettingsActivity crashed problem"
2022-09-28 09:32:06 +00:00
Chaohui Wang
ff5d430acc
Update Settings App for SpaEnvironment
...
Bug: 249028339
Test: Manual with Settings App
Change-Id: I4b174d250f20e827a383508beb3c9709128863ba
2022-09-28 15:25:43 +08:00
Chaohui Wang
99fd7e49e6
Fix app launch button not shown
...
This is caused by using getLaunchIntentForPackage() without specific
which user.
Use packageManagerAsUser to fix this issue.
Bug: 236346018
Test: Manual with Settings App
Change-Id: I7d71f9f46b18299245e654c9eef78232cb5e0392
2022-09-28 15:16:11 +08:00
menghanli
38714386f9
Provide ability to link to text reading page
...
Bug: 249430287
Test: manual test
Change-Id: I18fee380a69f92c74d567baf5476131a027913f5
2022-09-28 14:44:05 +08:00
Milton Wu
0004b7264d
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9
-s ours am: 5561341091
-s ours am: 8da95c29a9
-s ours am: 98b4b76031
-s ours am: 21bdc69fca
-s ours am: 215229d8b6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961564
Change-Id: I356c9ff1ebfa92ac2f7042835723fe50a3d1a19c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 05:49:50 +00:00
Milton Wu
215229d8b6
[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108b9
-s ours am: 5561341091
-s ours am: 8da95c29a9
-s ours am: 98b4b76031
-s ours am: 21bdc69fca
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961564
Change-Id: I02f0cd9e71ff15eb42018ece20fa3f7dec0013f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-28 05:21:03 +00:00