Commit Graph

724841 Commits

Author SHA1 Message Date
Pratyush More
174339022c Merge "Add unit tests for LocaleManagerService." 2021-10-07 12:21:02 +00:00
Matt Pietal
7da5998d03 Merge "Keyguard - Treat messsages to lock with priority" 2021-10-07 12:02:10 +00:00
TreeHugger Robot
41f7c354b5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3651700d32 -s ours am: ae829d25d2 -s ours am: 24a41418ec -s ours am: 9a83e29971 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16000293

Change-Id: I483aabd603eb10d363978dc706c94bef1d9435fd
2021-10-07 09:38:31 +00:00
TreeHugger Robot
9a83e29971 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3651700d32 -s ours am: ae829d25d2 -s ours am: 24a41418ec -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16000293

Change-Id: I6d4a0f67bd847ced468ffdac447967be85399da3
2021-10-07 09:23:23 +00:00
TreeHugger Robot
24a41418ec [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3651700d32 -s ours am: ae829d25d2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16000293

Change-Id: I4819cc13265396c3fcdc812d9af65c5bdf6833de
2021-10-07 09:09:08 +00:00
Automerger Merge Worker
1328e44fc0 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 49327062c2 -s ours am: 707f5f2fcd -s ours" 2021-10-07 09:08:38 +00:00
TreeHugger Robot
f2d2d0067e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3651700d32 -s ours am: 7edf3bc5d4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16000293

Change-Id: Ia0289355703f75224ecda84f979281a02e188aa4
2021-10-07 09:08:27 +00:00
TreeHugger Robot
d4dc4bf36a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 49327062c2 -s ours am: 707f5f2fcd -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15998781

Change-Id: I938db2b55d450bf13f33c8818d8a076977e4524c
2021-10-07 09:08:21 +00:00
TreeHugger Robot
ae829d25d2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3651700d32 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16000293

Change-Id: I53e7f6c4a20b68396aa277e47bed73094e18e8ea
2021-10-07 08:56:01 +00:00
TreeHugger Robot
7edf3bc5d4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 3651700d32 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16000293

Change-Id: I61d5154d3e42767e196545c1b1dfe39bd0337ec7
2021-10-07 08:55:29 +00:00
TreeHugger Robot
707f5f2fcd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 49327062c2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15998781

Change-Id: Iec32795eae2702670a289f57e4e2c1e70b2309d6
2021-10-07 08:54:50 +00:00
TreeHugger Robot
3651700d32 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-10-07 08:42:07 +00:00
TreeHugger Robot
49327062c2 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-10-07 08:40:58 +00:00
TreeHugger Robot
491e26f07a [automerger skipped] Merge "[DO NOT MERGE] Fix DozeScreenBrightnessTest." into sc-dev am: 82fe00fafe am: 60763f6650 am: d066568931 -s ours am: b410d844c6 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15994907

Change-Id: I23748a3644aace8bc288ac7c875b28ec079d98d9
2021-10-07 04:50:11 +00:00
Josh Tsuji
534ab8056e [automerger skipped] [DO NOT MERGE] Fix DozeScreenBrightnessTest. am: 20d85a91d4 am: ba860f3f98 am: e371f38acd -s ours am: c03b31ce53 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15994907

Change-Id: Ic15409d53d7707ac6c82d0485fe408af784d8d93
2021-10-07 04:49:40 +00:00
TreeHugger Robot
b410d844c6 [automerger skipped] Merge "[DO NOT MERGE] Fix DozeScreenBrightnessTest." into sc-dev am: 82fe00fafe am: 60763f6650 am: d066568931 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15994907

Change-Id: Ibdede1b08bde2a97d445d8ffd05c67262ddf3ff6
2021-10-07 04:35:38 +00:00
Josh Tsuji
c03b31ce53 [automerger skipped] [DO NOT MERGE] Fix DozeScreenBrightnessTest. am: 20d85a91d4 am: ba860f3f98 am: e371f38acd -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15994907

Change-Id: I528cfca3afd39cfcb2969d2adc1f07b3a1b48f90
2021-10-07 04:35:27 +00:00
TreeHugger Robot
d066568931 Merge "[DO NOT MERGE] Fix DozeScreenBrightnessTest." into sc-dev am: 82fe00fafe am: 60763f6650
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15994907

Change-Id: Id0e50277b2a2f4a8e968bf593045ed9dfffb0206
2021-10-07 04:23:58 +00:00
Josh Tsuji
e371f38acd [DO NOT MERGE] Fix DozeScreenBrightnessTest. am: 20d85a91d4 am: ba860f3f98
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15994907

Change-Id: Ibed65a17e425af06caf6a2b1d383344f1ae418ab
2021-10-07 04:23:57 +00:00
TreeHugger Robot
b3691198da [automerger skipped] Merge "[DO NOT MERGE] Fix DozeScreenBrightnessTest." into sc-dev am: 82fe00fafe am: 96078e3097 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15994907

Change-Id: I79968060ff75082a4f147e09ad428896a51b4cff
2021-10-07 04:23:52 +00:00
Josh Tsuji
e4cc823ae9 [automerger skipped] [DO NOT MERGE] Fix DozeScreenBrightnessTest. am: 20d85a91d4 am: 89eaae99a1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15994907

Change-Id: Ia31421381530d59cc7db540faae370d20e82a600
2021-10-07 04:23:30 +00:00
TreeHugger Robot
60763f6650 Merge "[DO NOT MERGE] Fix DozeScreenBrightnessTest." into sc-dev am: 82fe00fafe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15994907

Change-Id: I74541f7e7c1ce3ecdafdeb805bb35277d3220c32
2021-10-07 04:08:32 +00:00
TreeHugger Robot
96078e3097 Merge "[DO NOT MERGE] Fix DozeScreenBrightnessTest." into sc-dev am: 82fe00fafe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15994907

Change-Id: I0ad29866075911b942e5214cf41a3c68e53427b4
2021-10-07 04:08:28 +00:00
Josh Tsuji
89eaae99a1 [DO NOT MERGE] Fix DozeScreenBrightnessTest. am: 20d85a91d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15994907

Change-Id: I52d8385a263a1c6599120b59c9dd73efe08a3d0d
2021-10-07 04:08:22 +00:00
Josh Tsuji
ba860f3f98 [DO NOT MERGE] Fix DozeScreenBrightnessTest. am: 20d85a91d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15994907

Change-Id: I674c6d8ccbce26a406bbe0a8e669de6c2174cd3b
2021-10-07 04:08:08 +00:00
TreeHugger Robot
82fe00fafe Merge "[DO NOT MERGE] Fix DozeScreenBrightnessTest." into sc-dev 2021-10-07 03:56:02 +00:00
Evan Severson
0d3c394689 Merge "Fix setting camera op restriction on reboot" into sc-qpr1-dev am: 395f43dd6f am: 9f660a9636 am: dcadc7d8c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15983492

Change-Id: I1b1ef67d7da03e900ab2d9985e816dab6e49dd15
2021-10-07 03:39:20 +00:00
Evan Severson
e15027aaac Merge "Fix setting camera op restriction on reboot" into sc-qpr1-dev am: 395f43dd6f am: 77251b3ec4 am: 9e804aaab2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15983492

Change-Id: Ia1cdea4ad1b1136a9cb715300f26b8fe5466975f
2021-10-07 03:38:24 +00:00
Evan Severson
dcadc7d8c1 Merge "Fix setting camera op restriction on reboot" into sc-qpr1-dev am: 395f43dd6f am: 9f660a9636
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15983492

Change-Id: Ibefac6909a265458dec0e41dd6b3f2f324580558
2021-10-07 03:23:40 +00:00
Evan Severson
9e804aaab2 Merge "Fix setting camera op restriction on reboot" into sc-qpr1-dev am: 395f43dd6f am: 77251b3ec4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15983492

Change-Id: I13f6757e3865068b4316143667d8137c75da3c19
2021-10-07 03:23:09 +00:00
Evan Severson
77251b3ec4 Merge "Fix setting camera op restriction on reboot" into sc-qpr1-dev am: 395f43dd6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15983492

Change-Id: I80d0fd520600ec9e027df3b7d00a90cdb09091af
2021-10-07 03:09:37 +00:00
Evan Severson
9f660a9636 Merge "Fix setting camera op restriction on reboot" into sc-qpr1-dev am: 395f43dd6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15983492

Change-Id: Id37dddc45836bb75f911f93da71f11f49a843e83
2021-10-07 03:09:31 +00:00
Evan Severson
395f43dd6f Merge "Fix setting camera op restriction on reboot" into sc-qpr1-dev 2021-10-07 02:57:27 +00:00
Bill Yi
2d498947f9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia500ca7f590fc609a4b970cea849e124601ab577
2021-10-07 01:50:29 +00:00
TreeHugger Robot
a2871f84e9 Merge "Ensure pkg uid matches provided uid for device phone number check" into sc-qpr1-dev am: e2ba264dd0 am: 8b4e23ecf5 am: 01d849d74b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15926751

Change-Id: Ib5905258c43b943b287eaa5326aecf40c40f97cf
2021-10-07 01:50:23 +00:00
TreeHugger Robot
64015a60af Merge "Ensure pkg uid matches provided uid for device phone number check" into sc-qpr1-dev am: e2ba264dd0 am: 3b80e6bfd6 am: 8a63377e0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15926751

Change-Id: If3803fb52c9346f6b003b5972b6fb9b289ddb28a
2021-10-07 01:49:18 +00:00
Beth Thibodeau
f0808d7d04 Merge "Fix sorting issues with remote and resume controls" into sc-v2-dev am: bb9ecdd2af am: ec6c9495f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15985269

Change-Id: I3dad301f08ad024052bd25d4e6273ddfb3edb1fe
2021-10-07 01:48:13 +00:00
TreeHugger Robot
522fb739df Merge "Fix bug checking incorrect AppOp" into sc-qpr1-dev am: 886d034fb2 am: d29e0cdfd0 am: b643f03d8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15994552

Change-Id: Ic551b4b7e8a0db65c63bae1ac5fb1d6e192c35eb
2021-10-07 01:47:21 +00:00
TreeHugger Robot
05e4a5db77 Merge "Fix bug checking incorrect AppOp" into sc-qpr1-dev am: 886d034fb2 am: 6c3520b4bc am: 74fef03657
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15994552

Change-Id: Ie99ce82a7a044937a8b007bd32ea1ecc0c2f40ff
2021-10-07 01:46:38 +00:00
TreeHugger Robot
e0602e9c82 [automerger skipped] Merge "DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes." into rvc-dev am: e3a263bb6d am: b8f14a7db5 -s ours am: 3df34b9f6a -s ours am: 0cd4b1c9f8 -s ours am: ed63a0dc9f -s ours am: e6317a9f82 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15900956

Change-Id: I12ba2d48b5a469a22f0476a6d2a1ed6832eee437
2021-10-07 01:45:23 +00:00
Janis Danisevskis
5079e334d5 [automerger skipped] DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes. am: 395e56a71c am: b7c5457ce8 -s ours am: 908d3fae61 -s ours am: 8542a4c9ad -s ours am: e705adb221 -s ours am: 128ec9ad1c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15900956

Change-Id: Iec490ea884305b74704f8367df9329ae486ff33b
2021-10-07 01:45:07 +00:00
TreeHugger Robot
426423e13c [automerger skipped] Merge "DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes." into rvc-dev am: e3a263bb6d am: a68d603483 -s ours am: 80dc50df37 -s ours am: ba311d620c -s ours am: 9ef6dcc9fd -s ours am: 6fbc34a69b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15900956

Change-Id: I504c555d977d6e7287a34d63d05d20c1dad18ddd
2021-10-07 01:44:19 +00:00
Janis Danisevskis
619e035661 [automerger skipped] DO NOT MERGE KeyStore ChunkedStreamer must tolerate update consuming 0 bytes. am: 395e56a71c am: 9c6bc472e1 -s ours am: 65cf394942 -s ours am: 584ac26b3b -s ours am: 25b2e4e99e -s ours am: 7c29ac7e72 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15900956

Change-Id: I6e5da4d6b0a5d14718f87d217f8e9a53c777cc55
2021-10-07 01:43:57 +00:00
Bill Yi
705739f428 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib9a15b025d63f846245bba128958ff38eabf0463
2021-10-07 01:43:47 +00:00
TreeHugger Robot
6b276dca33 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 3376e545e0 -s ours am: 469e0a802f -s ours am: 6bed5c421d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15990752

Change-Id: I99801c4315bcd2b9c423637e7b639f74d7463baa
2021-10-07 01:42:20 +00:00
TreeHugger Robot
884e133514 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 3376e545e0 -s ours am: ac8b198fcd -s ours am: 0318638d0c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15990752

Change-Id: I3399fd052676d4057799bf780fbea4ca796a5aeb
2021-10-07 01:41:18 +00:00
Sarah Chin
c8200235bf [automerger skipped] Merge "Update constructors for IRadioData classes" am: fa565ffc48 -s ours am: ee05ff24d8 -s ours am: cf9c4df0bd -s ours am: d37723bdf8 -s ours am: 5f33241686 -s ours
am skip reason: Merged-In I8480df1164548dde491c6ae6251bbc2725c3eadf with SHA-1 80b8c7f128 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1840653

Change-Id: Ic0b7ca30a20a6abe9bcd6ee7fdb33c19a8e0b54f
2021-10-07 01:40:29 +00:00
TreeHugger Robot
b8452d81e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ecb92e8968 -s ours am: b352a93457 -s ours am: fd43bc731e -s ours am: 54671ccbf9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15991992

Change-Id: I0ac9d229ee154135f1760ac8b7e8ea557f50e430
2021-10-07 01:39:53 +00:00
TreeHugger Robot
70093fbde0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 14a18a67d2 -s ours am: ba77d3c1c8 -s ours am: 3ab3d6bee6 -s ours am: a4d9e694ef -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15990748

Change-Id: Icc9bc70147f352620486f4ce9ff9f0d8d176c2bc
2021-10-07 01:39:32 +00:00
Bill Yi
be7f8f87d4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3b6edf1163 -s ours am: 958d3f574c -s ours am: 818d96d8d9 -s ours am: c5eef6e8fd -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15991457

Change-Id: I25102b1183d1cdcaa0af75077c5aca6b6cbf0eee
2021-10-07 01:39:02 +00:00