Commit Graph

104902 Commits

Author SHA1 Message Date
Chaohui Wang
c6ddbcd753 Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev am: 932d5deaff am: 956f0a8cc2 am: e6adea223c am: 62702c7c6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835758

Change-Id: I4244a58c56e352aab999582d91941d11585dc2a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 09:53:37 +00:00
Bonian Chen
6a2479e7d1 Merge "[Settings] Code refactor for monitoring voice call status" 2022-04-22 09:37:08 +00:00
Stanley Wang
fea3e82627 Merge "Fix the problem that apps can read SIM card information through screenshots." into tm-dev am: 2e2a484a88 am: 18206def81 am: 0f2adc2166 am: 275f73f0f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859356

Change-Id: Ic57fb8a67cd9ca0f32c4cd9edfa4f45adba4efe9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 09:23:55 +00:00
TreeHugger Robot
5d519803ff [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 226baf6f25 -s ours am: 7d5cc42c81 -s ours am: 2b2fab41f2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6acc342f4d89d45d2d1b613f48708e1a2ee2ced2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 08:56:37 +00:00
Bill Yi
e8ffc3d41a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841 -s ours am: f1b797ac9b -s ours am: 52294cceea -s ours
am skip reason: subject contains skip directive

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

Change-Id: I036c2d936d0043ec7a91b5f976255dfb8fb3c3f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 08:56:20 +00:00
TreeHugger Robot
2b2fab41f2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 226baf6f25 -s ours am: 7d5cc42c81 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I52f5e12c78b60eccf6adde49a51b7cde996b6d2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 08:18:41 +00:00
Bill Yi
52294cceea [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841 -s ours am: f1b797ac9b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7306e7016fe40a97f23d2072b657112e1a83a1f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 08:18:24 +00:00
TreeHugger Robot
7d5cc42c81 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 226baf6f25 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id2024b4c9ab3d5bc9efd2985847f0396112ef464
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 07:52:28 +00:00
Bill Yi
f1b797ac9b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af08983841 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1d0c3fd484331c7cd7e1d55106fd1c89c67da57e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 07:52:01 +00:00
Bill Yi
142733021d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: bfd3ced372 -s ours am: 77893f9b81 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5f03cfe0876579c0b11de64d66340c78219b2b10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 06:58:58 +00:00
Bill Yi
d2dbac8c58 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e14416d5a3 -s ours am: 772186e057 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5c9a7174980f51884c4f919b475dd87641222e2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 06:58:33 +00:00
Bill Yi
934208c11c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ec36ec5c1 -s ours am: cfd4e0e395 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I30177a59e842702ccd88ecb22f3179fdaf604506
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 06:58:11 +00:00
Bill Yi
5802b3663e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f7be3a07f -s ours am: 602b5c15c6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I003a0c5f93bf6847d8255dd62702ebe6f48f7797
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 06:57:52 +00:00
TreeHugger Robot
47fcd97d5f Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev am: 49cc66afd3 am: df93d794dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859346

Change-Id: I71583d28a8b04761004fd570d4db6bf5faa2d5f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 06:34:07 +00:00
Bill Yi
77893f9b81 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: bfd3ced372 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I837f50c29d924b84ae438fd630813338a0d50e5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 06:20:10 +00:00
Bill Yi
772186e057 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e14416d5a3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If2a2da1244c5302bc3421db1a5570cb5a674cffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 06:19:42 +00:00
Bill Yi
cfd4e0e395 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3ec36ec5c1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie301565e0ffb8d2630c42235d47c1afa64e85be9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 06:19:17 +00:00
Bill Yi
602b5c15c6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f7be3a07f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id0b0a3aa83056874bec89d994838716846914c99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 06:18:57 +00:00
Bill Yi
bfd3ced372 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-22 06:17:37 +00:00
Bill Yi
3ec36ec5c1 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-22 06:17:37 +00:00
TreeHugger Robot
df93d794dc Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev am: 49cc66afd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859346

Change-Id: I18251815257f45eccb7e02d3b20c103272007201
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 06:07:43 +00:00
TreeHugger Robot
49cc66afd3 Merge "[Settings] Code refactor for async Lifecycle listening" into tm-dev 2022-04-22 05:50:05 +00:00
TreeHugger Robot
226baf6f25 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-22 03:59:00 +00:00
Chaohui Wang
556f178854 Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev am: 932d5deaff am: 78e47ccfa1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835758

Change-Id: I2759f985d1e217e66154c448a73faf116612c317
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 03:28:18 +00:00
Stanley Wang
2259174ccd Merge "Fix the problem that apps can read SIM card information through screenshots." into tm-dev am: 2e2a484a88 am: a5bc0fd0db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859356

Change-Id: Iaab093cbbfc3b78f7718ac51354510033e0b9aa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 03:28:01 +00:00
Chaohui Wang
62702c7c6c Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev am: 932d5deaff am: 956f0a8cc2 am: e6adea223c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835758

Change-Id: I04b164c903cc125b0a7e3cd12fef43d0ed2eff51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 03:27:23 +00:00
Stanley Wang
275f73f0f2 Merge "Fix the problem that apps can read SIM card information through screenshots." into tm-dev am: 2e2a484a88 am: 18206def81 am: 0f2adc2166
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859356

Change-Id: I55a0802d79317ee9ccf037e19e9121122bf606b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 03:26:54 +00:00
Chaohui Wang
e6adea223c Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev am: 932d5deaff am: 956f0a8cc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835758

Change-Id: I5e359cdb6af0e6845544c03dba06d1fd2b8cf520
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 03:11:39 +00:00
Stanley Wang
0f2adc2166 Merge "Fix the problem that apps can read SIM card information through screenshots." into tm-dev am: 2e2a484a88 am: 18206def81
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859356

Change-Id: I56cca0c9d5d7baf8b316a22ba6e5125874cb5395
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 03:11:33 +00:00
Chaohui Wang
78e47ccfa1 Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev am: 932d5deaff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835758

Change-Id: I688bfcc7872b7865631e9f96ecffe02bc16f9d75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 02:44:52 +00:00
Stanley Wang
a5bc0fd0db Merge "Fix the problem that apps can read SIM card information through screenshots." into tm-dev am: 2e2a484a88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859356

Change-Id: I9eaec2b8a7cc4ff7838f259e4c059b3be52fba45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 02:44:09 +00:00
Chaohui Wang
956f0a8cc2 Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev am: 932d5deaff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17835758

Change-Id: I36dbc24d358252cbc935eec76e23287e774823dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 02:35:55 +00:00
Stanley Wang
18206def81 Merge "Fix the problem that apps can read SIM card information through screenshots." into tm-dev am: 2e2a484a88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17859356

Change-Id: Ia0b0ec3b7a772d241112cc7f45d42a677de4a827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 02:35:46 +00:00
Xiaowen Lei
5d3b0f46e3 Merge "Set "screensaver" as synonym of "Screen saver" for Settings search." into tm-qpr-dev am: d06a66be9f am: 54b996c88b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17890050

Change-Id: I5f07563d7879226c84c8017fa058267d7cee1729
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 02:26:22 +00:00
Chaohui Wang
932d5deaff Merge "Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver" into tm-dev 2022-04-22 02:15:23 +00:00
Stanley Wang
2e2a484a88 Merge "Fix the problem that apps can read SIM card information through screenshots." into tm-dev 2022-04-22 02:08:12 +00:00
Xiaowen Lei
54b996c88b Merge "Set "screensaver" as synonym of "Screen saver" for Settings search." into tm-qpr-dev am: d06a66be9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17890050

Change-Id: I0389695bfb0210181963a6c6507524b00f6f9884
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 01:45:48 +00:00
Xiaowen Lei
d06a66be9f Merge "Set "screensaver" as synonym of "Screen saver" for Settings search." into tm-qpr-dev 2022-04-22 00:49:40 +00:00
Bill Yi
8bae7abc6a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9896cc4089 -s ours am: 6fcdbbeac5 -s ours am: e2f0df2e2b -s ours am: 5ff67942e7 -s ours am: 3d592e4b7a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I06c165a663aade2f509b1e9bc15ebeda4cea67af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 23:15:02 +00:00
Bill Yi
3d592e4b7a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9896cc4089 -s ours am: 6fcdbbeac5 -s ours am: e2f0df2e2b -s ours am: 5ff67942e7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic13ecff661de7d1fe4163800cb28511d5fb7b535
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 22:45:53 +00:00
Bill Yi
1aa06e3def [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9896cc4089 -s ours am: 6fcdbbeac5 -s ours am: e2f0df2e2b -s ours am: fba53c2569 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If24623272f61cb4414c7ddd7be84f80b7307378f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 22:45:26 +00:00
Bill Yi
5ff67942e7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9896cc4089 -s ours am: 6fcdbbeac5 -s ours am: e2f0df2e2b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id41039c2f2cad58516035cfa28d8255b36a6cd05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 22:21:54 +00:00
Bill Yi
fba53c2569 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9896cc4089 -s ours am: 6fcdbbeac5 -s ours am: e2f0df2e2b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I05e379c071f17ba69facf60f301a46a5e9a018e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 22:20:51 +00:00
Bill Yi
e2f0df2e2b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9896cc4089 -s ours am: 6fcdbbeac5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3b7bd4377446fe3aa6ff6f45ffeabbec177f243d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 21:52:59 +00:00
Abel Tesfaye
8814d96884 Fix issue where SmartAutoRotateController tries to unregister an unregistered receiver
Controllers are automatically bound to a lifecycle if registered in the xml file. Manually binding a lifecycle can cause multiple receivers to be unregistered/registered. Removing the manual binding will prevent this case from causing a potential exception.

Bug: 227762968

Test: none
Change-Id: I9c8ddc6f82b19cd4a9c8a4aec3c9c744935cd542
2022-04-21 21:31:03 +00:00
Bill Yi
6fcdbbeac5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9896cc4089 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iccbbd4929788c7a64c6b3aeb9a318684054eb07e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 21:29:09 +00:00
Bill Yi
441b939fdb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f8009a8a13 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4107999026e302ca9745fc107c79868c6e6cb2b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 20:18:03 +00:00
Bill Yi
6c24a77a6a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e6d15f05d2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4078cf7c1ee0138e810b24583d4b4bc90bffcfb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 20:17:34 +00:00
Bill Yi
7dd0963f58 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6e3dbf4e89 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1c2ae5a5a950bd1c311bd8b4b2ceafa7c824fb09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 20:17:15 +00:00
Bill Yi
eb215294d8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9381013a1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia3bfacb3b22077d5e2ad427f40abb48bb1ed8e39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 20:16:59 +00:00