Raff Tsai
0b36c5e9ba
[automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693 am: 65294e6ee5 -s ours
...
am: c808f15cbe -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history
Change-Id: Ia806284e60b86d6d942de73a98d8ef3b48cd6847
2019-06-05 02:17:52 -07:00
Raff Tsai
20b5a01f6c
[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09 am: bfe5b37bc8 -s ours
...
am: 530fa8b25b -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history
Change-Id: Iaa5411ff17dddbda7b6584afff8f0a7527609c23
2019-06-05 02:17:44 -07:00
Raff Tsai
d20d75c39b
[automerger skipped] Do not allow draw on top for App notification settings skipped: 04208f16b0 am: 6dbb3108a7 -s ours
...
am: 59348982d3 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history
Change-Id: I50749ba4c4a8478acbd70a729fb6e4f1e722254d
2019-06-05 02:17:35 -07:00
Raff Tsai
14302b3ac6
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev
...
am: 09e255676b -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history
Change-Id: I9ffa1beaa1f10e45dfb29edd2ea1bfd7b4422407
2019-06-05 02:13:22 -07:00
Raff Tsai
80fea5de92
[automerger skipped] Merge changes from topic "security_fix_settings" into oc-dev
...
am: 8c612b1334 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 5d9328571e is in history
Change-Id: I252ffcb3e7c5f1be519c9e809d6b43a296bcbe9d
2019-06-05 02:12:49 -07:00
Raff Tsai
c808f15cbe
[automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693
...
am: 65294e6ee5 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history
Change-Id: I02047207e9ed30afb0afb003f0c93f2cfb59addd
2019-06-05 02:12:01 -07:00
Raff Tsai
530fa8b25b
[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09
...
am: bfe5b37bc8 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history
Change-Id: I68b5c6aebfd69660c51613b6a96ef0c354d800ae
2019-06-05 02:11:52 -07:00
Raff Tsai
59348982d3
[automerger skipped] Do not allow draw on top for App notification settings skipped: 04208f16b0
...
am: 6dbb3108a7 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 c968eacbbf is in history
Change-Id: I171e67f778cd8e8f67cb8d685ecfe09316619cf5
2019-06-05 02:11:36 -07:00
TreeHugger Robot
09e255676b
Merge changes from topic "security_fix_settings" into oc-dev
...
* changes:
[automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693
[automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96
[automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e
Do not allow draw on top for App notification settings
2019-06-05 09:02:31 +00:00
TreeHugger Robot
8c612b1334
Merge changes from topic "security_fix_settings" into oc-dev
...
* changes:
[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09
[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631
[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d
[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8
[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e
Do not allow draw on top for App notification settings
2019-06-05 09:02:31 +00:00
Android Build Merger (Role)
65294e6ee5
[automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96 skipped: 0b52ca4693
...
Change-Id: I45fe88086caf9220b67162863828d3bf0ea30d7f
2019-06-05 02:50:10 +00:00
Android Build Merger (Role)
0b52ca4693
[automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e skipped: ed126b5d96
...
Change-Id: I6f8236a1de4c8edc766ae625fe0010924e4cfba3
2019-06-05 02:50:07 +00:00
Android Build Merger (Role)
ed126b5d96
[automerger skipped] Do not allow draw on top for App notification settings skipped: 50ec2c218e
...
Change-Id: I5ed98836a8659baedf50724ce1f65c76bcace5ef
2019-06-05 02:50:04 +00:00
Android Build Merger (Role)
6dbb3108a7
[automerger skipped] Do not allow draw on top for App notification settings skipped: 04208f16b0
...
Change-Id: I0b4d8af9f5306150b58fb5cc8e10ba192458a458
2019-06-05 02:48:34 +00:00
Android Build Merger (Role)
bfe5b37bc8
[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631 skipped: ceb1ed0a09
...
Change-Id: I8f2da352d0658de16a2b4087067a57fa7cf40ad6
2019-06-05 02:37:14 +00:00
Android Build Merger (Role)
ceb1ed0a09
[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d skipped: 188904e631
...
Change-Id: Ief79f2f50874bbfcd214b1ce3248b10532a24452
2019-06-05 02:37:12 +00:00
Android Build Merger (Role)
188904e631
[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8 skipped: 8f70c24f2d
...
Change-Id: I9f55b76cc7079a2eb682c2093f57ac0c58e524c9
2019-06-05 02:37:11 +00:00
Android Build Merger (Role)
8f70c24f2d
[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e skipped: e537ffece8
...
Change-Id: I1a5227631dbc4446af520c71e9d23b54bec5085f
2019-06-05 02:37:09 +00:00
Android Build Merger (Role)
e537ffece8
[automerger skipped] Do not allow draw on top for App notification settings skipped: 5d9328571e
...
Change-Id: Id4e7e996a34a5520a3785e2e778e75b4ee02ed02
2019-06-05 02:37:07 +00:00
Raff Tsai
50ec2c218e
Do not allow draw on top for App notification settings
...
Fixes: 119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit fe86a2a51f )
2019-05-31 17:51:00 +00:00
Raff Tsai
5d9328571e
Do not allow draw on top for App notification settings
...
Fixes: 119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit fe86a2a51f )
2019-05-31 17:50:17 +00:00
Raff Tsai
08672ec74e
[automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am: 811229a2fd am: fd058ab872 -s ours
...
am: 3fb5933880 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 9fa8329b02 is in history
Change-Id: I68b1c3e845c9f8cff305583b6cd19869e36cc027
2019-05-29 18:40:29 -07:00
Raff Tsai
3fb5933880
[automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-dev am: 811229a2fd
...
am: fd058ab872 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 e4800786cf is in history
Change-Id: I7fbd29f4d72fda672e986f12d17e37bee1b89e4b
2019-05-29 18:35:24 -07:00
Raff Tsai
fd058ab872
Merge "Do not allow draw on top for App notification settings" into oc-dev
...
am: 811229a2fd
Change-Id: Ie5ed40b8f573b974850234987bacc5ae7db925a4
2019-05-29 18:30:24 -07:00
Raff Tsai
8837b15f78
[automerger skipped] Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev
...
am: b95361ab60 -s ours
am skip reason: change_id Ib7b878a23b4a99171c58b5de992fb87feca8a28a with SHA1 9fa8329b02 is in history
Change-Id: I66e6f4f24bd7349db363f28f0462d16825e544c8
2019-05-29 18:28:27 -07:00
TreeHugger Robot
811229a2fd
Merge "Do not allow draw on top for App notification settings" into oc-dev
2019-05-30 01:14:19 +00:00
TreeHugger Robot
b95361ab60
Merge "Do not allow draw on top for App notification settings" into oc-mr1-dev
2019-05-30 01:11:01 +00:00
TreeHugger Robot
4d01717c14
Merge "Do not allow draw on top for App notification settings" into pi-dev
2019-05-30 00:15:17 +00:00
Bill Yi
d6d1ac5e87
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I69697c36e862b2725dfd7fa1f542f9f7a3c6fa03
2019-05-18 06:44:53 -07:00
Jonathan Scott
550496d236
[automerger skipped] [automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6 skipped: 333afb4357 am: bd3672b2d8 am: 9f280a15a2
...
am: 306ff7e3a9 -s ours
am skip reason: subject contains skip directive
Change-Id: If66c539a683b4edeeca60140fb6c85eed1902d99
2019-05-08 16:25:48 -07:00
Jonathan Scott
306ff7e3a9
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6 skipped: 333afb4357 am: bd3672b2d8
...
am: 9f280a15a2
Change-Id: I2dae0b0e41b34480c99a81fd3c05014e5ec43f33
2019-05-08 16:09:26 -07:00
Jonathan Scott
9f280a15a2
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6 skipped: 333afb4357
...
am: bd3672b2d8
Change-Id: I9157d6fd4afc3426142dbfbbdc9a57aceb2b7d7f
2019-05-08 15:43:07 -07:00
Android Build Merger (Role)
bd3672b2d8
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6 skipped: 333afb4357
...
Change-Id: If8d375a600b9db7b011b08770ad6e7fbf29073c4
2019-05-08 20:51:48 +00:00
Android Build Merger (Role)
333afb4357
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b am: 003ce809c6
...
Change-Id: Ief43c33183fa5f24cf3bd9f26c9d7362d235492e
2019-05-08 20:51:45 +00:00
Android Build Merger (Role)
003ce809c6
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc am: 7d86790c7b
...
Change-Id: I89b5b93b63beb9f52e5799c822edccf208158f39
2019-05-08 20:51:43 +00:00
Android Build Merger (Role)
7d86790c7b
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29 am: 133337b4dc
...
Change-Id: Ibb0d6c1d0253c78160d66e27a2847192c19d10d1
2019-05-08 20:51:40 +00:00
Android Build Merger (Role)
133337b4dc
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am: b985aa2f29
...
Change-Id: Iee20bc7fe4fe756b87c9231689792ab50f8a76bc
2019-05-08 20:51:37 +00:00
Jonathan Scott
b985aa2f29
[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks.
...
Bug: 127605586
Test: Manual
Change-Id: I4186c2d57b42b6e3d27013f2c9708fca56c561fe
Merged-In: I1cdd82bea4dc9e4182694b061a7746aa83dabdfe
2019-05-08 20:51:35 +00:00
TreeHugger Robot
db98a8edec
Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev
2019-05-08 20:00:27 +00:00
Christopher Dombroski
6b34347b4c
Treat mode_default as denied for install_unknown_apps am: 4b78bcd5cd am: aebc5bbc94
...
am: 1d163af113
Change-Id: Icdbf3b7a403270384d92a0a9fed1326ca16b232f
2019-05-07 21:15:40 -07:00
Christopher Dombroski
1d163af113
Treat mode_default as denied for install_unknown_apps am: 4b78bcd5cd
...
am: aebc5bbc94
Change-Id: Ia0b46cf2ff284b149df14451b04e1d2b935e4942
2019-05-07 20:20:44 -07:00
Christopher Dombroski
aebc5bbc94
Treat mode_default as denied for install_unknown_apps
...
am: 4b78bcd5cd
Change-Id: I09e4fa32947b51a6614012ae3f42062416ca086e
2019-05-07 19:14:43 -07:00
Jonathan Scott
687b18067c
[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController.
...
Bug: 127605586
Test: Manual
Change-Id: Id85632b5e6975fc5f92d6e8126a6603a07f097e1
2019-05-07 15:28:05 -07:00
Raff Tsai
04208f16b0
Do not allow draw on top for App notification settings
...
Fixes: 119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit fe86a2a51f )
2019-05-03 12:14:35 +08:00
Raff Tsai
c968eacbbf
Do not allow draw on top for App notification settings
...
Fixes: 119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit fe86a2a51f )
2019-05-03 03:12:32 +00:00
Raff Tsai
e4800786cf
Do not allow draw on top for App notification settings
...
Fixes: 119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit fe86a2a51f )
2019-04-26 10:18:51 +08:00
Christopher Dombroski
4b78bcd5cd
Treat mode_default as denied for install_unknown_apps
...
Test: atest SettingsRoboTests
Bug: 123700348
Change-Id: Ieeb6456854cc3d0faa0e9c407accd94f56a25813
Merged-In: Ieeb6456854cc3d0faa0e9c407accd94f56a25813
2019-04-24 18:29:53 +00:00
Raff Tsai
9fa8329b02
Do not allow draw on top for App notification settings
...
Fixes: 119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit fe86a2a51f )
2019-04-19 16:17:07 +08:00
Bill Yi
83d678bdc4
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I27c0efa466b676aafccb399704805959704fe165
2019-04-05 12:44:47 -07:00
Rich Cannings
5d9189fab2
Merge "DO NOT MERGE Refactor passwords/pins/patterns to byte[]" into pi-dev
2019-03-28 21:15:33 +00:00