Automerger Merge Worker
781ac2d738
Merge "Fix mismatching intent filter string in AndroidManifest.xml" am: 177ce8f017 am: 0fbe648878 am: a7a2a28247
...
Change-Id: I8a49a6600aed234c5dc8659ee1e43d5ca9557e38
2020-03-16 22:56:11 +00:00
Automerger Merge Worker
a7a2a28247
Merge "Fix mismatching intent filter string in AndroidManifest.xml" am: 177ce8f017 am: 0fbe648878
...
Change-Id: I4f885bb7ccd171693ed239441dd86a5f41ccf503
2020-03-16 22:40:58 +00:00
Automerger Merge Worker
0fbe648878
Merge "Fix mismatching intent filter string in AndroidManifest.xml" am: 177ce8f017
...
Change-Id: I1a5185fb2c7eae81cd98ccbe713a333e09431d64
2020-03-16 22:21:51 +00:00
Treehugger Robot
177ce8f017
Merge "Fix mismatching intent filter string in AndroidManifest.xml"
2020-03-16 22:07:18 +00:00
joshmccloskey
593b5671c8
Require attention pref not searchable by default
...
Test: Attempted to search with the keyword eyes and found nothing.
Bug: 150933895
Change-Id: Ic69d4fc9fe495fe6d133b695ce48055f6fd65d35
2020-03-16 22:03:28 +00:00
Grace Jia
16092ab56f
Fix mismatching intent filter string in AndroidManifest.xml
...
Test: Manual
Bug: 149524255
Change-Id: Ic5bfbfa41cba18ccc8166624da33c70b69db73f5
2020-03-16 13:27:25 -07:00
Automerger Merge Worker
675e22fd10
Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7fcc am: f4ca410ad7 am: 28153ffaa7 am: 3d20254943 am: 43699ecba2
...
Change-Id: I53597dca77706f4e2a748f72bb7e20f1950cf8ca
2020-03-16 20:22:20 +00:00
Automerger Merge Worker
3118ae1e22
Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7fcc am: 022790b197 am: 5d89b0f2ec am: f10a92d8a6
...
Change-Id: I2bbc09e37b87163bf89943e5c78e5bf50ba1c42c
2020-03-16 20:20:53 +00:00
Automerger Merge Worker
ce524d941f
Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7fcc am: f4ca410ad7 am: 19b27604b6 am: 5df00d8c17
...
Change-Id: I18691f8b67c7b2f04edd1bf247fba35f7c13b9cc
2020-03-16 20:17:44 +00:00
Automerger Merge Worker
43699ecba2
Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7fcc am: f4ca410ad7 am: 28153ffaa7 am: 3d20254943
...
Change-Id: Ic7b8b3aa932c8466e6b87607c8c39d537913cc99
2020-03-16 20:04:15 +00:00
Kweku Adams
a7e58d7732
Change to public POWER_SAVE_MODE_CHANGED broadcast.
...
The POWER_SAVE_MODE_CHANGING broadcast is sent at the same time as the
POWER_SAVE_MODE_CHANGED broadcast. Since broadcasts are asynchronous,
there's no reason to have both, so we're simplifying down to just one.
Bug: 79580230
Test: atest BatterySaverReceiverTest
Change-Id: Ib27fc91bc23126f58532e534575d912e3b72ac43
2020-03-16 12:56:46 -07:00
Automerger Merge Worker
f10a92d8a6
Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7fcc am: 022790b197 am: 5d89b0f2ec
...
Change-Id: Ia92d029869a13d586c10f5f45288147be71b63fc
2020-03-16 19:55:57 +00:00
Automerger Merge Worker
5df00d8c17
Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7fcc am: f4ca410ad7 am: 19b27604b6
...
Change-Id: I504e066358f6ab7ec4f8cb0bd1c22ce6bb83b325
2020-03-16 19:54:29 +00:00
Automerger Merge Worker
3d20254943
Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7fcc am: f4ca410ad7 am: 28153ffaa7
...
Change-Id: I6235fcf297b45c050b270655271d2427d2a483cc
2020-03-16 19:38:49 +00:00
Automerger Merge Worker
5d89b0f2ec
Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7fcc am: 022790b197
...
Change-Id: I5884d3ffde43083d9860626f94b84b7b224080a8
2020-03-16 19:26:38 +00:00
Automerger Merge Worker
28153ffaa7
Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7fcc am: f4ca410ad7
...
Change-Id: Iddb2ce5e1d29636d2583e113412c917cc286dcf1
2020-03-16 19:26:36 +00:00
Automerger Merge Worker
19b27604b6
Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7fcc am: f4ca410ad7
...
Change-Id: Id7f186a312c69aeed5c7acefd7c3865df361e76a
2020-03-16 19:25:31 +00:00
Automerger Merge Worker
f4ca410ad7
Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7fcc
...
Change-Id: I4eea86045bc033677c33c716c39174314ffe1d7e
2020-03-16 19:09:20 +00:00
Automerger Merge Worker
e9ffb190ca
Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf am: d3b8d8c603 am: 894c3dc565 am: 341fcc9afb am: 055242cd55
...
Change-Id: Ia0758a67e0c020df679c8f128686555b7fbe2227
2020-03-16 19:09:18 +00:00
Automerger Merge Worker
022790b197
Merge "Do not finish early if caller is SUW" into rvc-dev am: b2c35f7fcc
...
Change-Id: Ic74ab9f03b43fd1eebcb6fc32556f37b31c20943
2020-03-16 19:08:28 +00:00
Automerger Merge Worker
364ba4f50f
[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours am: 4768304de8 -s ours am: 4629097190 -s ours am: fb39e01364 -s ours am: f022b89e4d -s ours
...
am skip reason: subject contains skip directive
Change-Id: I905f9acbe4d6419bbef4ad76dfae0a77c2550fbe
2020-03-16 19:08:27 +00:00
Automerger Merge Worker
5b1481536b
Merge "Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf am: d3b8d8c603" into rvc-d1-dev-plus-aosp am: ea3d48855c am: 612a7fd595
...
Change-Id: I71b33a8618402da54eda47451f55930ed715ca1a
2020-03-16 19:08:22 +00:00
Automerger Merge Worker
8c7425973d
Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf am: 7486f6a010 am: 8965b8677b am: 3ef781bae5
...
Change-Id: I7d767aff435a3a4ce2eec7c878d91a2272309c94
2020-03-16 19:08:13 +00:00
Automerger Merge Worker
055242cd55
Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf am: d3b8d8c603 am: 894c3dc565 am: 341fcc9afb
...
Change-Id: Ib5910e2106d29f3f676e87377051c35bbc1b5116
2020-03-16 19:08:03 +00:00
Automerger Merge Worker
34274b10ac
Merge "[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours am: 4768304de8 -s ours" into rvc-d1-dev-plus-aosp am: 6d4df5ece8 -s ours am: c3955a98d0 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I455dd3ecbe2291182a138724a677c5a7ce9155e5
2020-03-16 19:08:03 +00:00
Automerger Merge Worker
f022b89e4d
[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours am: 4768304de8 -s ours am: 4629097190 -s ours am: fb39e01364 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Iabcd5c6cf1befd4756cfee654d0c5f6a3041f979
2020-03-16 19:07:51 +00:00
Automerger Merge Worker
1ca59537cc
[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours am: c4e391ad7c -s ours am: 624190cb2a -s ours am: 44067999f6 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I105eefcef6e7274c318abd4a11bda9b03d0bd723
2020-03-16 19:07:51 +00:00
Automerger Merge Worker
341fcc9afb
Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf am: d3b8d8c603 am: 894c3dc565
...
Change-Id: Ia9cbc8c3bd79e2f9b17ed509d5c16e4050e8107e
2020-03-16 18:57:04 +00:00
Automerger Merge Worker
612a7fd595
Merge "Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf am: d3b8d8c603" into rvc-d1-dev-plus-aosp am: ea3d48855c
...
Change-Id: I8597d6c3635c2753526218ecc315720f0b7fce1a
2020-03-16 18:57:01 +00:00
TreeHugger Robot
b2c35f7fcc
Merge "Do not finish early if caller is SUW" into rvc-dev
2020-03-16 18:56:54 +00:00
Automerger Merge Worker
3ef781bae5
Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf am: 7486f6a010 am: 8965b8677b
...
Change-Id: I80a79e40e6a1f5bbd03d7144ce79ab9defad02e4
2020-03-16 18:56:38 +00:00
Automerger Merge Worker
fb39e01364
[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours am: 4768304de8 -s ours am: 4629097190 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I2358abc58f9203a9dfe75d99649e09ca7a4b11c3
2020-03-16 18:55:59 +00:00
Automerger Merge Worker
c3955a98d0
Merge "[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours am: 4768304de8 -s ours" into rvc-d1-dev-plus-aosp am: 6d4df5ece8 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I6525cece7ed4080aad179606e6b6d2368e6c5062
2020-03-16 18:55:58 +00:00
Automerger Merge Worker
44067999f6
[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours am: c4e391ad7c -s ours am: 624190cb2a -s ours
...
am skip reason: subject contains skip directive
Change-Id: Id1e73931f1167535f85d6b76d494de439864247a
2020-03-16 18:55:34 +00:00
Automerger Merge Worker
894c3dc565
Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf am: d3b8d8c603
...
Change-Id: I0734d11a825d521825f474c17137058eb33f128c
2020-03-16 18:43:03 +00:00
Automerger Merge Worker
ea3d48855c
Merge "Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf am: d3b8d8c603" into rvc-d1-dev-plus-aosp
2020-03-16 18:42:57 +00:00
Automerger Merge Worker
4629097190
[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours am: 4768304de8 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ic1e70e00fe7273b71d5e2e45c407d1f0a750ef7a
2020-03-16 18:42:56 +00:00
Automerger Merge Worker
015ea725f6
Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf am: d3b8d8c603
...
Change-Id: I8fcd965aed01fddb516eb6bb1b99486331dff0c9
2020-03-16 18:42:53 +00:00
Automerger Merge Worker
8965b8677b
Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf am: 7486f6a010
...
Change-Id: I639eaa2d87eb80b5b4b12779dc2750445c9f9a84
2020-03-16 18:42:49 +00:00
Automerger Merge Worker
6d4df5ece8
Merge "[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours am: 4768304de8 -s ours" into rvc-d1-dev-plus-aosp
2020-03-16 18:42:22 +00:00
Automerger Merge Worker
e4258d5c03
[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours am: 4768304de8 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I140b938dff8b500f6807a36ce8ffe81a28cbc473
2020-03-16 18:42:18 +00:00
Automerger Merge Worker
624190cb2a
[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours am: c4e391ad7c -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie14b440004aa649b06f10834e80316cee2a99348
2020-03-16 18:42:14 +00:00
Automerger Merge Worker
d3b8d8c603
Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf
...
Change-Id: I9b3494582be6e8e3563dc75e59ed8d921b834475
2020-03-16 18:26:26 +00:00
Automerger Merge Worker
7486f6a010
Merge "Update NLS/NAS warning text" into rvc-dev am: 6c9cad2caf
...
Change-Id: I592406722b54ca059e4159826edff6d453802db2
2020-03-16 18:25:34 +00:00
Automerger Merge Worker
c4e391ad7c
[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie8de471415f4dd47fe4da433648cda9c173848b9
2020-03-16 18:25:25 +00:00
Automerger Merge Worker
4768304de8
[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours am: 0a9e463fff -s ours
...
am skip reason: subject contains skip directive
Change-Id: If219277f2764d85a82482fd2c8782bf6caa1a3c7
2020-03-16 18:24:32 +00:00
TreeHugger Robot
6c9cad2caf
Merge "Update NLS/NAS warning text" into rvc-dev
2020-03-16 18:10:09 +00:00
Automerger Merge Worker
0a9e463fff
[automerger skipped] Import translations. DO NOT MERGE am: d49c677499 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I6e10c86bf149e6eae1e1efbc00da7ec2e0e86c88
2020-03-16 18:09:37 +00:00
Kevin Chyn
e6bcc49eb9
Do not finish early if caller is SUW
...
Fixes: 151576034
Test: Wipe device, go past fingerprint enrollment in SUW, press
back button. SUW should not get stuck
Change-Id: I9021946dd169acfa205e6bacc4c4581242452983
2020-03-16 09:32:41 -07:00
Bill Yi
d49c677499
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Ic27dcb9095c3058386601a78f844419467f147a1
2020-03-16 08:20:15 -07:00
