TreeHugger Robot
1b5fd5904d
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296
am: 3b2fe3e89e
am: 7fb0500aa8
am: f20d28e0c3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446
Change-Id: I251634e96e47dee560b9031f2122893ec8042a72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 21:36:13 +00:00
TreeHugger Robot
4ab4d68f60
Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72
am: 45580a02a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456
Change-Id: Id674f125687fc60af9359a95b2852cbbc33d4a2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 21:32:24 +00:00
TreeHugger Robot
4091170456
Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72
am: 063e34e53c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456
Change-Id: Iaa080b1ba55ad24a174edb5907a5b3fe7dd78584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 21:31:32 +00:00
TreeHugger Robot
5f50ce04f1
Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72
am: 063e34e53c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456
Change-Id: I03e4dcfe1a635099d1f13026d1d6a9d21b2348a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 21:31:05 +00:00
TreeHugger Robot
063e34e53c
Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456
Change-Id: I48f417627a248636a9aecf0b3a25d9f0ce45eaa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 20:39:13 +00:00
TreeHugger Robot
45580a02a4
Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456
Change-Id: Ic7f0628f3ef18ee92733fee88e21242a1424c62a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 20:37:28 +00:00
Automerger Merge Worker
12e7db6478
Merge "Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296
am: f7b4e4adc9" into tm-d1-dev-plus-aosp am: 4b1b519a92
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446
Change-Id: I7d6ec073481c07d8e59f61bd10b3a572d793c7ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 20:28:51 +00:00
TreeHugger Robot
0e2bc2d45a
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296
am: 3b2fe3e89e
am: 863843c7b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446
Change-Id: Ic9f3f0e2544a456fef1ddf1e7b9d39092535bd6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 20:28:40 +00:00
TreeHugger Robot
f20d28e0c3
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296
am: 3b2fe3e89e
am: 7fb0500aa8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446
Change-Id: I8c69d810b6544dc86f8bf69b6e53214cbd5cc4a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 20:27:55 +00:00
TreeHugger Robot
1c45e9ad72
Merge "Update fingerprint removal dialog strings" into tm-dev
2022-06-10 20:09:03 +00:00
Milton Wu
d6ac148573
Merge "Update SUW fingerprint string" into tm-qpr-dev am: 75d49b02bc
am: b6fbd10af4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753041
Change-Id: I527b6e366f8b8fd5487458acdb5af763fcc6cac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 20:07:46 +00:00
Automerger Merge Worker
4b1b519a92
Merge "Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296
am: f7b4e4adc9" into tm-d1-dev-plus-aosp
2022-06-10 19:58:41 +00:00
TreeHugger Robot
863843c7b0
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296
am: 3b2fe3e89e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446
Change-Id: I80e67d73410150349c3501001c3b8d2252dfe4be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 19:58:38 +00:00
TreeHugger Robot
7fb0500aa8
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296
am: 3b2fe3e89e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446
Change-Id: I14e635b309b81f636043f550e01e185c4839dd31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 19:58:36 +00:00
TreeHugger Robot
661c13a194
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296
am: f7b4e4adc9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446
Change-Id: If4f9c33086ac7d1041e073a63214c33390b575ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 19:58:33 +00:00
Milton Wu
b6fbd10af4
Merge "Update SUW fingerprint string" into tm-qpr-dev am: 75d49b02bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753041
Change-Id: I61ce4d033c1f4cfa57347ad781c2ecbce4da20de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 19:40:24 +00:00
TreeHugger Robot
3b2fe3e89e
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446
Change-Id: I11486349b04ce9af7004e6761e6d419e4892baf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 18:56:02 +00:00
TreeHugger Robot
f7b4e4adc9
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446
Change-Id: I6c28e8ad8fc8e97cf1f6c5c290562f7b6dda4821
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 18:54:24 +00:00
Eric Biggers
ff16ec8542
Use StorageManager.isFileEncrypted() instead of deprecated methods
...
Since emulated FBE is no longer supported, isFileEncryptedNativeOnly()
and isFileEncryptedNativeOrEmulated() are the same as the new method
isFileEncrypted(). Replace all calls to these deprecated methods in
this repository with isFileEncrypted().
Bug: 232458753
Change-Id: I95beea86ef771396c2e08f2d6a643fdc629ad89f
2022-06-10 17:42:38 +00:00
Milton Wu
75d49b02bc
Merge "Update SUW fingerprint string" into tm-qpr-dev
2022-06-10 17:33:44 +00:00
TreeHugger Robot
fc45c25296
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev
2022-06-10 17:25:25 +00:00
Joshua Mccloskey
239b2a8d5a
Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d
am: 06b76edbb7
am: e634c8e1ed
am: ee1b2589ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434
Change-Id: I5c70309621914231ad8e35aea4a6c7bdd7153c22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 17:23:02 +00:00
Joshua Mccloskey
cbd9fded1a
Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d
am: 02f0255b7a
am: 6f430f8e66
am: 0e7a40a699
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434
Change-Id: Ie2710b1556fc8601d4bfa9eb58986471169044eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 17:22:53 +00:00
Joshua Mccloskey
3a1905d357
Merge "Added consent message for FaceAuth enrollment." into tm-d1-dev am: 52450aaa17
am: 9f1af4fc86
am: 083125dff3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802135
Change-Id: I62e0d5d570efb53cd3256d106fc3d528ad18105f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 17:22:44 +00:00
Joshua Mccloskey
6bf5d1db1b
Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d
am: 02f0255b7a
am: 62db0f71bc
am: 74d3ba859f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434
Change-Id: I04fe63c31701d4ced300a0a62dafe4c387f9f6b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 17:21:47 +00:00
Joshua Mccloskey
898620420c
Merge "Added consent message for FaceAuth enrollment." into tm-d1-dev am: 52450aaa17
am: 4d48d8266d
am: d32a6c0512
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802135
Change-Id: Id0c2f0adf89d8e140737611c148266bafe417e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 17:21:00 +00:00
Joshua Mccloskey
ee1b2589ec
Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d
am: 06b76edbb7
am: e634c8e1ed
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434
Change-Id: I4946ea1efc7c4093bcacac9ad62e31a3df739a4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 17:05:31 +00:00
Joshua Mccloskey
0e7a40a699
Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d
am: 02f0255b7a
am: 6f430f8e66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434
Change-Id: I91b535902a62cc4726581ab8209a4d0d66620cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 17:05:25 +00:00
Joshua Mccloskey
e634c8e1ed
Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d
am: 06b76edbb7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434
Change-Id: Ic384140de7b6166a126a2afad2396175a4c7d4f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 17:05:14 +00:00
Joshua Mccloskey
083125dff3
Merge "Added consent message for FaceAuth enrollment." into tm-d1-dev am: 52450aaa17
am: 9f1af4fc86
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802135
Change-Id: I7797f6c9d3a139374b211855c1bedfda9393046b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 17:04:03 +00:00
Joshua Mccloskey
74d3ba859f
Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d
am: 02f0255b7a
am: 62db0f71bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434
Change-Id: Ide094dbadfbaa9fcbb5aefbf8c31523ae00d0184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 17:03:54 +00:00
Joshua Mccloskey
d32a6c0512
Merge "Added consent message for FaceAuth enrollment." into tm-d1-dev am: 52450aaa17
am: 4d48d8266d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802135
Change-Id: I2a53040c4a9a4afee0815c2791a2d381b3dfa993
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 17:03:11 +00:00
Joshua Mccloskey
6f430f8e66
Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d
am: 02f0255b7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434
Change-Id: I61bb8dcd5fb07d4493bfe6f140008e2567e923cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 16:37:36 +00:00
Joshua Mccloskey
62db0f71bc
Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d
am: 02f0255b7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434
Change-Id: I034b937a7e24f0af32f2f7371a0b0711dfa19bfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 16:37:30 +00:00
Joshua Mccloskey
02f0255b7a
Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434
Change-Id: I2424dc5d7377fd8f86f6d7d6c0dc14dfc274425d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 16:29:29 +00:00
Joshua Mccloskey
4d48d8266d
Merge "Added consent message for FaceAuth enrollment." into tm-d1-dev am: 52450aaa17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802135
Change-Id: I12156eb5416d5e7a30454ccffe32d6bdbb248e5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 16:29:13 +00:00
Joshua Mccloskey
9f1af4fc86
Merge "Added consent message for FaceAuth enrollment." into tm-d1-dev am: 52450aaa17
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802135
Change-Id: Idb03b051753fa418e8ffb40d6f2fbc1a7d7db287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 16:29:07 +00:00
Joshua Mccloskey
06b76edbb7
Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434
Change-Id: I024b04ef4f87b923ff48d09fcf88036f7b51b89c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 16:27:59 +00:00
Joshua Mccloskey
52450aaa17
Merge "Added consent message for FaceAuth enrollment." into tm-d1-dev
2022-06-10 16:06:17 +00:00
Joshua Mccloskey
75313dcb5d
Merge "Updated FP enroll confirmation string" into tm-dev
2022-06-10 16:05:31 +00:00
Neil Fuller
b16b5b5476
Merge "Switch auto time setting to use APIs"
2022-06-10 13:45:07 +00:00
TreeHugger Robot
861ee5b749
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07
-s ours am: 999a23bee0
-s ours am: 579cdfb0a8
-s ours am: 664882ad8e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: I414379b3f5d42cd70b6d6f0c064c4c7eae84767d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 08:22:27 +00:00
Bill Yi
6f84923110
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5391d591c8
-s ours am: 16761c0f92
-s ours am: ca3537a81e
-s ours am: 78f220eba8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: Ie0391e24129aba025f3e57a1731f284d7dbe4fa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 08:22:24 +00:00
TreeHugger Robot
e5a38588ad
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71826af4fb
-s ours am: 3b34105f01
-s ours am: 772ae4174e
-s ours am: 95f865c789
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: I504a4510085f50fc8db0140b832b046aa7f5119b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 08:22:15 +00:00
Bill Yi
aa0c19f905
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1ebda67c2
-s ours am: b807236c50
-s ours am: 26d9456296
-s ours am: 4835ec5d28
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: I762d56927958056780d4e644c684cb7be7806cce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 08:22:02 +00:00
Automerger Merge Worker
c4012459d7
Merge changes from topic "am-1b5ff54850484f67a65c2bda86eb0cf0" into tm-qpr-dev-plus-aosp am: 06908e191a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: I5ab8041f693777d8e47f1c9e1d4ca6159cf873db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 08:19:20 +00:00
TreeHugger Robot
be2b7518e9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07
-s ours am: ee896b46e1
-s ours am: 05d57094a6
-s ours am: c4141b38c2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: I472139447bfa4e08e71f83f3f2c23b29f0090aa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 08:19:08 +00:00
TreeHugger Robot
5eea619c04
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07
-s ours am: ee896b46e1
-s ours am: 3bf9830e4f
-s ours am: 76a3494ee9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: If7eabf5d79f03542bfe5fcfc90e6675b588b02dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 08:13:33 +00:00
Bill Yi
164a34e5d5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5391d591c8
-s ours am: 6a5ff2d6a9
-s ours am: 2ed856f004
-s ours am: b9e43fd0ee
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818927
Change-Id: I35234cef47e502ad25c901d53666d465b529d444
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 08:13:26 +00:00
TreeHugger Robot
b5484e8860
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71826af4fb
-s ours am: 1175da33ce
-s ours am: 706ca35aa8
-s ours am: 6ee656bf72
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18818504
Change-Id: Id9deffe18c543c162b1651727081002cb2a1bad2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 08:13:15 +00:00