Commit Graph

422410 Commits

Author SHA1 Message Date
Mathew Inwood
bd4daa2460 Merge "Greylist 3P packages in the bootclasspath." into qt-dev am: 2cf040d602
am: ed914a5bd2

Change-Id: Ia484c22570d79fa81bd318cfd48803b3543ca872
2019-05-29 00:18:53 -07:00
Mathew Inwood
ed914a5bd2 Merge "Greylist 3P packages in the bootclasspath." into qt-dev
am: 2cf040d602

Change-Id: I0ec7c3e6855c0e7b2960a8f8285ca69870bcf0d9
2019-05-29 00:13:51 -07:00
Mathew Inwood
2cf040d602 Merge "Greylist 3P packages in the bootclasspath." into qt-dev 2019-05-29 07:00:23 +00:00
Android Build Merger (Role)
5ca21c63b2 Merge "Merge "Fix a deadlock between WindowManagerGlobal and WindowManagerService" into qt-dev am: 99d4417d4f am: 2ab464988f" into qt-r1-dev-plus-aosp 2019-05-29 06:10:03 +00:00
Arthur Hung
8d1aae9e97 Merge "Fix a deadlock between WindowManagerGlobal and WindowManagerService" into qt-dev am: 99d4417d4f
am: 2ab464988f

Change-Id: I04c80d3e4bc37e9e0f6f8658df48cb6b282d360a
2019-05-28 23:08:58 -07:00
Arthur Hung
5d3599b0e3 Merge "Fix a deadlock between WindowManagerGlobal and WindowManagerService" into qt-dev am: 99d4417d4f
am: 8201bb3ad6

Change-Id: I64ed10191fcf3e119e67727a426c99e02123da80
2019-05-28 23:08:57 -07:00
Android Build Merger (Role)
b977331bdd Merge "Merge "Fix clipboard permission issue for AugmentedAutofillService provider." into qt-dev am: 3c0eeb951f am: d272fe2950" into qt-r1-dev-plus-aosp 2019-05-29 06:04:52 +00:00
Arthur Hung
8201bb3ad6 Merge "Fix a deadlock between WindowManagerGlobal and WindowManagerService" into qt-dev
am: 99d4417d4f

Change-Id: I99ad47e8e92f4831f6434e3952661849e55004c1
2019-05-28 23:03:59 -07:00
Arthur Hung
2ab464988f Merge "Fix a deadlock between WindowManagerGlobal and WindowManagerService" into qt-dev
am: 99d4417d4f

Change-Id: I091aaecebec82f58e6d74749fbdbfaeb64d85382
2019-05-28 23:03:57 -07:00
Feng Cao
d76e2a051c Merge "Fix clipboard permission issue for AugmentedAutofillService provider." into qt-dev am: 3c0eeb951f
am: 437d6fe499

Change-Id: I0e6c0b7ceed44ce3ac5e16e85d873619421bf7be
2019-05-28 23:03:57 -07:00
Feng Cao
be1357d158 Merge "Fix clipboard permission issue for AugmentedAutofillService provider." into qt-dev am: 3c0eeb951f
am: d272fe2950

Change-Id: I66d6b1b8d1a92186e670644ab3ced87624c5d231
2019-05-28 23:03:55 -07:00
TreeHugger Robot
99d4417d4f Merge "Fix a deadlock between WindowManagerGlobal and WindowManagerService" into qt-dev 2019-05-29 06:00:15 +00:00
Feng Cao
d272fe2950 Merge "Fix clipboard permission issue for AugmentedAutofillService provider." into qt-dev
am: 3c0eeb951f

Change-Id: I0a54efe3583720c9d4d70731c248b6117ac073b1
2019-05-28 22:58:57 -07:00
Feng Cao
437d6fe499 Merge "Fix clipboard permission issue for AugmentedAutofillService provider." into qt-dev
am: 3c0eeb951f

Change-Id: Id4d23405bfb8e2f214aca9533f2f1f57bac8575c
2019-05-28 22:58:56 -07:00
Feng Cao
3c0eeb951f Merge "Fix clipboard permission issue for AugmentedAutofillService provider." into qt-dev 2019-05-29 05:53:39 +00:00
Android Build Merger (Role)
2ec07bc023 Merge "Merge "Don't run AttentionDetector when wakelock is held" into qt-dev am: ed8620ae02 am: 7ba03c7f76" into qt-r1-dev-plus-aosp 2019-05-29 05:15:43 +00:00
Alex Salo
5d48345c72 Merge "Don't run AttentionDetector when wakelock is held" into qt-dev am: ed8620ae02
am: 7ba03c7f76

Change-Id: Ic08a2d8ec49009f60efc13e8d7461b93b304f8a7
2019-05-28 22:15:01 -07:00
Alex Salo
fc2edf9847 Merge "Don't run AttentionDetector when wakelock is held" into qt-dev am: ed8620ae02
am: b326363d94

Change-Id: Iffe2e9673b3de295412bb882d893f84fca524040
2019-05-28 22:14:26 -07:00
Android Build Merger (Role)
94868075fb Merge "Merge "Hide floating rotation button upon click" into qt-dev am: 8f5770a0b3 am: 279e47ff19" into qt-r1-dev-plus-aosp 2019-05-29 05:13:46 +00:00
Tracy Zhou
e441362c59 Merge "Hide floating rotation button upon click" into qt-dev am: 8f5770a0b3
am: ed0cd48ee0

Change-Id: Icca155b927edadee0bf5607d02ee6ee4b5422d26
2019-05-28 22:12:49 -07:00
Tracy Zhou
7356404620 Merge "Hide floating rotation button upon click" into qt-dev am: 8f5770a0b3
am: 279e47ff19

Change-Id: Ic191519f24660c77a63c8dace0519409371aa9af
2019-05-28 22:12:48 -07:00
Alex Salo
b326363d94 Merge "Don't run AttentionDetector when wakelock is held" into qt-dev
am: ed8620ae02

Change-Id: I28b9770a60a5ddbcc44449401e078c2dc651a0e2
2019-05-28 22:09:36 -07:00
Alex Salo
7ba03c7f76 Merge "Don't run AttentionDetector when wakelock is held" into qt-dev
am: ed8620ae02

Change-Id: I0e6767143f3f7c0bedc90a15400055a062c3c90f
2019-05-28 22:09:29 -07:00
Tracy Zhou
ed0cd48ee0 Merge "Hide floating rotation button upon click" into qt-dev
am: 8f5770a0b3

Change-Id: I46f7ec471a80af4b2c0df21dd406180ac2269432
2019-05-28 22:07:48 -07:00
Tracy Zhou
279e47ff19 Merge "Hide floating rotation button upon click" into qt-dev
am: 8f5770a0b3

Change-Id: I6567861faf3c98127b463ba6314a69b17b592ba4
2019-05-28 22:07:48 -07:00
TreeHugger Robot
ed8620ae02 Merge "Don't run AttentionDetector when wakelock is held" into qt-dev 2019-05-29 04:56:52 +00:00
Tracy Zhou
8f5770a0b3 Merge "Hide floating rotation button upon click" into qt-dev 2019-05-29 04:56:04 +00:00
Android Build Merger (Role)
da67860d7c Merge "Merge "skip permission check for TelephonyManager API getMmsUserAgent" into qt-dev am: 924c6eb536 am: 7e5fa37b11" into qt-r1-dev-plus-aosp 2019-05-29 04:38:47 +00:00
Chen Xu
5775217520 Merge "skip permission check for TelephonyManager API getMmsUserAgent" into qt-dev am: 924c6eb536
am: fbc75e2a7f

Change-Id: Ic6f8e97e1973da835caaa86e19f934fc44e021ae
2019-05-28 21:37:44 -07:00
Chen Xu
2d0beb6876 Merge "skip permission check for TelephonyManager API getMmsUserAgent" into qt-dev am: 924c6eb536
am: 7e5fa37b11

Change-Id: I94deaa04ad5ad7f5bce034ad1a692cb1c4bec6e5
2019-05-28 21:37:43 -07:00
Chen Xu
fbc75e2a7f Merge "skip permission check for TelephonyManager API getMmsUserAgent" into qt-dev
am: 924c6eb536

Change-Id: Ia7a563f8e46a869c39d4aeb6baba7f79d7a6e190
2019-05-28 21:32:44 -07:00
Chen Xu
7e5fa37b11 Merge "skip permission check for TelephonyManager API getMmsUserAgent" into qt-dev
am: 924c6eb536

Change-Id: Ibb34ee3980b10e5791c0239676d03c3b4304dfd8
2019-05-28 21:32:43 -07:00
Chen Xu
924c6eb536 Merge "skip permission check for TelephonyManager API getMmsUserAgent" into qt-dev 2019-05-29 04:27:06 +00:00
Android Build Merger (Role)
61d1fb7096 Merge "Merge "Fixed an issue where notifications could visually overlap" into qt-dev am: 5894d5b851 am: 87d0dceecd" into qt-r1-dev-plus-aosp 2019-05-29 04:08:30 +00:00
Selim Cinek
ee338da9bd Merge "Fixed an issue where notifications could visually overlap" into qt-dev am: 5894d5b851
am: 87d0dceecd

Change-Id: I4c2f89ff3eb184db98c7bf117b489838f52a30bf
2019-05-28 21:07:37 -07:00
Selim Cinek
09a78c4abe Merge "Fixed an issue where notifications could visually overlap" into qt-dev am: 5894d5b851
am: 01ddad3876

Change-Id: I43a1ca32d3d4b3be639b9bd796caab6402b4b39c
2019-05-28 21:07:34 -07:00
Selim Cinek
01ddad3876 Merge "Fixed an issue where notifications could visually overlap" into qt-dev
am: 5894d5b851

Change-Id: I9853c734b1269957193a6f82da241f288036c3ea
2019-05-28 20:55:06 -07:00
Selim Cinek
87d0dceecd Merge "Fixed an issue where notifications could visually overlap" into qt-dev
am: 5894d5b851

Change-Id: I390a31685da652d08143ebc1a8ab46e7e33d5d58
2019-05-28 20:55:05 -07:00
Selim Cinek
5894d5b851 Merge "Fixed an issue where notifications could visually overlap" into qt-dev 2019-05-29 03:40:15 +00:00
Beth Thibodeau
90d6b55362 Merge "Add logging for media notification seekbar" into qt-dev am: 01ed4e2798
am: 9a82286eb1

Change-Id: I2c098f19ca7b08c0a6190f4c810228cd37c2d483
2019-05-28 20:34:51 -07:00
Lucas Dupin
440f6505e0 Merge "Fix stale media metadata" into qt-dev am: 67cec194bd
am: c79e773d15

Change-Id: If5e50bcb172e2fc1bf0416537f43b99a304477e4
2019-05-28 20:33:26 -07:00
Beth Thibodeau
9a82286eb1 Merge "Add logging for media notification seekbar" into qt-dev
am: 01ed4e2798

Change-Id: Ia4067ade7ecd3f96b75db07e5ac763faf11d5223
2019-05-28 20:29:31 -07:00
Lucas Dupin
c79e773d15 Merge "Fix stale media metadata" into qt-dev
am: 67cec194bd

Change-Id: I70b84be576fffe5899412e9bfce2d6ada9fae53a
2019-05-28 20:28:08 -07:00
Beth Thibodeau
21546d2145 Merge "Add logging for media notification seekbar" into qt-dev am: 01ed4e2798
am: 6f483e3f24

Change-Id: I8d51c6bb9160ee8c9c4b9031dc0fc6f8f15388de
2019-05-28 20:26:57 -07:00
Lucas Dupin
0d14f8eeb5 Merge "Fix stale media metadata" into qt-dev am: 67cec194bd
am: cfd9a06d6f

Change-Id: Ia4e8f6b04de93f5d2dab0459813ce02465c052b2
2019-05-28 20:21:13 -07:00
Beth Thibodeau
6f483e3f24 Merge "Add logging for media notification seekbar" into qt-dev
am: 01ed4e2798

Change-Id: I91dddb8e2e95d2e328513b4421203c2a30fb0bbb
2019-05-28 20:20:54 -07:00
Lucas Dupin
cfd9a06d6f Merge "Fix stale media metadata" into qt-dev
am: 67cec194bd

Change-Id: Ic1f9035509bcbb2b9c2e096a243f1d890425744a
2019-05-28 20:16:14 -07:00
Beth Thibodeau
01ed4e2798 Merge "Add logging for media notification seekbar" into qt-dev 2019-05-29 03:14:17 +00:00
Lucas Dupin
67cec194bd Merge "Fix stale media metadata" into qt-dev 2019-05-29 03:01:24 +00:00
Suprabh Shukla
75ef528fc5 Merge "Use ISE to indicate alarm limit" into qt-dev am: be50040106
am: 08bc4ab04d

Change-Id: I55ff9825502f53d32648c4f03f280dae5bf66271
2019-05-28 19:56:14 -07:00