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
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
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
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
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
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
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
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
Fan Zhang
657f8713ff
[automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49
am: b810aee20f
am: 7a58589114
am: 7926131837
am: d6bde3f5b8
am: ba87cf7444
...
am: 9366d11e6d
Change-Id: Icd4cf6000dd9d72f486417f1d11dde008d49c513
2019-03-08 15:01:41 -08:00
Fan Zhang
9366d11e6d
[automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49
am: b810aee20f
am: 7a58589114
am: 7926131837
am: d6bde3f5b8
...
am: ba87cf7444
Change-Id: I3b3a2411f4be05e1b8f6ecfce3521c5932028038
2019-03-08 14:55:32 -08:00
TreeHugger Robot
decb412d5b
Merge "Do not allow draw on top for default sms picker." into nyc-dev
2019-03-08 22:34:09 +00:00
Android Build Merger (Role)
ba87cf7444
[automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49
am: b810aee20f
am: 7a58589114
am: 7926131837
am: d6bde3f5b8
...
Change-Id: I029a177108cbe0c6646b9c717e910266c9a5a410
2019-02-20 21:54:41 +00:00
Android Build Merger (Role)
d6bde3f5b8
[automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49
am: b810aee20f
am: 7a58589114
am: 7926131837
...
Change-Id: I16c54cab9346d161d668dc4183ae4a9eb7117996
2019-02-20 21:54:39 +00:00
Android Build Merger (Role)
7926131837
[automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49
am: b810aee20f
am: 7a58589114
...
Change-Id: I9212ffd96f974268c0069e80e68347102967e7e5
2019-02-20 21:54:37 +00:00
Android Build Merger (Role)
7a58589114
[automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49
am: b810aee20f
...
Change-Id: Ic6e4308ee65a83e7d00801452323569301e65d66
2019-02-20 21:54:34 +00:00
Android Build Merger (Role)
b810aee20f
[automerger] Do not allow draw on top for default sms picker. am: 95d0fb7f49
...
Change-Id: I9466105a6de960efb4513d4e856450459aec2560
2019-02-20 21:54:31 +00:00
Fan Zhang
95d0fb7f49
Do not allow draw on top for default sms picker.
...
Fixes: 120484087
Test: manual
Change-Id: I4be265565678302fad207839216d5cd65dcb6e94
Merged-In: I4be265565678302fad207839216d5cd65dcb6e94
(cherry picked from commit 9d46e1fdfe
)
2019-02-20 13:53:51 -08:00
Fan Zhang
622444d488
[automerger skipped] Hide quicksetting tile for dev options when it's turned off am: 73469d9de1
...
am: eeaff5deeb
-s ours
Change-Id: I1da9e0c3e5a170eb16a11a616d8a76fe6424d420
2018-11-20 02:34:38 -08:00
Fan Zhang
eeaff5deeb
Hide quicksetting tile for dev options when it's turned off
...
am: 73469d9de1
Change-Id: Ibd19748e11218a958a00eaf501d9d8ab7cfc96e0
2018-11-20 02:28:15 -08:00
Fan Zhang
73469d9de1
Hide quicksetting tile for dev options when it's turned off
...
Merged-In: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Change-Id: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Fixes: 78652607
Bug: 117770924
Test: robotests
2018-11-12 20:25:51 +08:00
Fan Zhang
04f1e38dc3
Hide quicksetting tile for dev options when it's turned off
...
Merged-In: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Change-Id: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Fixes: 78652607
Bug: 117770924
Test: robotests
2018-11-12 19:52:32 +08:00
jackqdyulei
c05958ecdd
Update PBAP info for all pairing dialogs. DO NOT MERGE am: ff171eff8e
...
am: 618b808b61
Change-Id: Id92a02a67661e0b7707564b7d83a7ff7f27854e1
2018-09-07 10:46:08 -07:00
jackqdyulei
618b808b61
Update PBAP info for all pairing dialogs. DO NOT MERGE
...
am: ff171eff8e
Change-Id: I21d048a1ad2d0e37870d380c30e95ee8e3a48091
2018-09-07 10:42:16 -07:00
jackqdyulei
ff171eff8e
Update PBAP info for all pairing dialogs. DO NOT MERGE
...
This is a bug from ag/4210612, in which it only update PBAP info
for USER_ENTRY_DIALOG. So in other kind of dialogs it never upload
correct PBAP info to bluetooth backend.
This CL fix it by updating PBAP for all dialogs.
Change-Id: Ia39eee1acaece555e8e5a305ec2c803294d7efbd
Merged-In: Ia39eee1acaece555e8e5a305ec2c803294d7efbd
Bug: 109842273
Bug: 72872376
Test: RunSettingsRoboTests
(cherry picked from commit 7015e20a55
)
2018-09-06 16:35:58 -07:00
Doris Ling
bea56da7d6
[automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev am: 62158f0943
-s ours
...
am: 2ef0e15b66
-s ours
Change-Id: I3c13ee22f6e19d1ba45dd9fc34489d45c887ef35
2018-08-09 15:26:36 -07:00
Doris Ling
2ef0e15b66
[automerger skipped] Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev
...
am: 62158f0943
-s ours
Change-Id: I892834c6c0655f40954ee94d98b29ac271b3de4c
2018-08-09 15:19:19 -07:00
TreeHugger Robot
62158f0943
Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into oc-dev
2018-08-09 21:51:32 +00:00
TreeHugger Robot
38b9504a41
Merge "Disable changing lock when device is not provisioned." into oc-mr1-dev
2018-08-09 19:47:07 +00:00
Doris Ling
4a6da68af7
Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into oc-dev am: 197a10b053
...
am: 9245b98d0f
Change-Id: Ia674ef3fc7eb8042c58ca3da03ecb8b08df91eed
2018-08-09 12:06:31 -07:00
Doris Ling
d1146af517
Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev am: 528be61eeb
...
am: 78a7ee2f10
Change-Id: I82960fb637152698cb676fae82862408b1a2db75
2018-08-09 12:05:08 -07:00
Doris Ling
0f0147213e
[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b
am: 3672a1fe7f
...
am: cff5200146
Change-Id: I44df485b49098b69371d1248067e51559dcd4964
2018-08-09 12:03:48 -07:00
Doris Ling
9245b98d0f
Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into oc-dev
...
am: 197a10b053
Change-Id: I398a80b0e514f9c2439b3852996a4190b0d32b96
2018-08-09 12:02:34 -07:00
Doris Ling
78a7ee2f10
Merge changes from topic "am-cffdd762-a2a7-44ac-bcee-f8a14942d37e" into oc-dev
...
am: 528be61eeb
Change-Id: I8ee97a35c41ef54dde584ddd61b2afea577a9ad3
2018-08-09 12:00:42 -07:00
Doris Ling
cff5200146
[automerger skipped] DO NOT MERGE Disable changing lock when device is not provisioned. skipped: 94ea2dad5b
...
am: 3672a1fe7f
Change-Id: Ia9b1b5a4dee46b3a66b21080b54b6f9b92629c0f
2018-08-09 11:58:38 -07:00
TreeHugger Robot
8e20b46f3f
Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into nyc-mr2-dev
...
* changes:
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f
am: d98908e7c7
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f
DO NOT MERGE Disable changing lock when device is not provisioned.
2018-08-09 18:43:34 +00:00
TreeHugger Robot
f0d84f0841
Merge changes from topic "am-c29676a7-0c49-4630-a71f-e8774428272f-nyc-mr1-dev" into cw-f-dev
...
* changes:
[automerger] DO NOT MERGE Disable changing lock when device is not provisioned. am: cd0b97e86f
DO NOT MERGE Disable changing lock when device is not provisioned.
2018-08-09 18:43:34 +00:00
TreeHugger Robot
597820a687
Merge "DO NOT MERGE Disable changing lock when device is not provisioned." into nyc-mr1-dev
2018-08-09 18:43:34 +00:00