Commit Graph

421696 Commits

Author SHA1 Message Date
Hyunyoung Song
8146eacf23 Merge "Add live wallpaper metrics to atoms.proto" into qt-dev am: 2f6110f832
am: 8e324522a2

Change-Id: I64c518f63c6a5be6b2000a627682aa0ed83eb744
2019-05-24 16:36:18 -07:00
Android Build Merger (Role)
81f1fa52e1 Merge "[automerger skipped] Merge "[Magnifier-86] Fix deadlock causing ANR" into qt-dev am: 0c7e69bdb6 am: f752a6a86b -s ours am skip reason: change_id Idf0373ab0d5033d56da0f6f45d7d953f7e796813 with SHA1 c8beb5c0f0 is in history" into qt-r1-dev-plus-aosp 2019-05-24 23:32:06 +00:00
Bin Chen
f9692dc314 [automerger skipped] Merge "[Magnifier-86] Fix deadlock causing ANR" into qt-dev am: 0c7e69bdb6
am: f752a6a86b -s ours
am skip reason: change_id Idf0373ab0d5033d56da0f6f45d7d953f7e796813 with SHA1 c8beb5c0f0 is in history

Change-Id: Id14a7214f1d1ee38f6405752b48115f480738068
2019-05-24 16:31:31 -07:00
Android Build Merger (Role)
7af8f98feb Merge "Merge "Allow notifs from the default sms app to be blocked" into qt-dev am: aa0eeb3857 am: 422b9550f7" into qt-r1-dev-plus-aosp 2019-05-24 23:26:36 +00:00
Julia Reynolds
bd73439c2c Merge "Allow notifs from the default sms app to be blocked" into qt-dev am: aa0eeb3857
am: 422b9550f7

Change-Id: I95fb95efb89e47d400e0c4e6e6d17f75eff1bb88
2019-05-24 16:24:27 -07:00
Lucas Dupin
fe7d9edb91 Merge "Remove clock shadows from light mode" into qt-dev am: 88932c42c4
am: c5b6711d3c

Change-Id: I2ae89f6a2c3a14d3c9200130f1cd0977d778a709
2019-05-24 16:22:58 -07:00
Yao Chen
794090d20d Merge "Statsd: apex modules in uid map" into qt-dev am: a36325306a
am: 303c8f3ea3

Change-Id: I1c322b0cef56f44b1482776b19839dc5e62df464
2019-05-24 16:18:55 -07:00
Hyunyoung Song
8e324522a2 Merge "Add live wallpaper metrics to atoms.proto" into qt-dev
am: 2f6110f832

Change-Id: I91f1ffde3d66850fd2b47eed24ba33f8c15a4a8c
2019-05-24 16:00:27 -07:00
Lucas Dupin
c5b6711d3c Merge "Remove clock shadows from light mode" into qt-dev
am: 88932c42c4

Change-Id: Ibfce4c9d0800624fc7b02b0b4e5cbe66efe9f4f6
2019-05-24 15:54:44 -07:00
Hyunyoung Song
2f6110f832 Merge "Add live wallpaper metrics to atoms.proto" into qt-dev 2019-05-24 22:43:04 +00:00
Lucas Dupin
88932c42c4 Merge "Remove clock shadows from light mode" into qt-dev 2019-05-24 22:26:50 +00:00
John Reck
480bf1fdc6 Merge "Log less" into qt-dev am: 7ede526835
am: b019513682

Change-Id: I7f9fb7c4af46b77115e10ccb21c6070a47dadf0b
2019-05-24 14:18:19 -07:00
John Reck
b019513682 Merge "Log less" into qt-dev
am: 7ede526835

Change-Id: I610b67e5ed999291ac08bcd76e6d135bb496c10b
2019-05-24 14:09:05 -07:00
TreeHugger Robot
7ede526835 Merge "Log less" into qt-dev 2019-05-24 20:48:31 +00:00
Mark Renouf
c5f174e9f1 Merge "Combine discrete listener methods into single state update" into qt-dev am: a58661397f
am: 885cdcae1f

Change-Id: I72946f3f7d1a5c0af36e9b4e31e694b149b29960
2019-05-24 12:53:03 -07:00
Selim Cinek
a295d2a6bd Merge "Ensure smart suggestion background color is updated just after inflation" into qt-dev am: 404bc92bf5
am: 4d3bf3ec10

Change-Id: Iff05fd5be9f4563239f7cfd7c2df15f5c2f637f1
2019-05-24 12:21:45 -07:00
Julia Reynolds
36d9b0017d Merge "Get rid of unnecessary policy file saves" into qt-dev am: ffc7647e57
am: 6b3e3fe087

Change-Id: I853f13a22d9b54f84762d201ee0cd7413b971c94
2019-05-24 12:14:17 -07:00
Mark Renouf
885cdcae1f Merge "Combine discrete listener methods into single state update" into qt-dev
am: a58661397f

Change-Id: I15cd12ba263d5dcd520c61cb4c9ac145ffe3c47e
2019-05-24 12:04:03 -07:00
Brad Ebinger
608fd93f45 Merge "Add CAPABILITY_EMERGENCY_PREFERRED in PhoneAccount" into qt-dev am: a105253ea8
am: f4e407d1d5

Change-Id: I13501efa263ca10383c69747b244f49ed0c9ddfd
2019-05-24 12:03:23 -07:00
Selim Cinek
4d3bf3ec10 Merge "Ensure smart suggestion background color is updated just after inflation" into qt-dev
am: 404bc92bf5

Change-Id: I4e662b5adc6995bb51d36833df3719f845a7d1ec
2019-05-24 11:58:28 -07:00
Bin Chen
6294913428 Merge "[Magnifier-86] Fix deadlock causing ANR" into qt-dev am: 0c7e69bdb6
am: 009fecb8ad

Change-Id: Ic75473ac042db97c995a3b990422e95a9a86d981
2019-05-24 11:56:55 -07:00
Julia Reynolds
6b3e3fe087 Merge "Get rid of unnecessary policy file saves" into qt-dev
am: ffc7647e57

Change-Id: Ie5836a2f854f9198c67e8c38eca0c09d816ffc3f
2019-05-24 11:51:11 -07:00
Julia Reynolds
82dde88b83 Merge "Allow notifs from the default sms app to be blocked" into qt-dev am: aa0eeb3857
am: f23f184c87

Change-Id: I563b9a04a748b58e302ecbb6c1f71c3e6bb87937
2019-05-24 11:49:42 -07:00
Yao Chen
9edbc61587 Merge "Statsd: apex modules in uid map" into qt-dev am: a36325306a
am: 5c95661423

Change-Id: I97f0dbc8b29b30b1c5ffbf2e9c158a6df3b8cc7b
2019-05-24 11:44:09 -07:00
Mark Renouf
a58661397f Merge "Combine discrete listener methods into single state update" into qt-dev 2019-05-24 18:32:51 +00:00
Selim Cinek
404bc92bf5 Merge "Ensure smart suggestion background color is updated just after inflation" into qt-dev 2019-05-24 18:13:55 +00:00
Julia Reynolds
ffc7647e57 Merge "Get rid of unnecessary policy file saves" into qt-dev 2019-05-24 18:13:05 +00:00
Brad Ebinger
f4e407d1d5 Merge "Add CAPABILITY_EMERGENCY_PREFERRED in PhoneAccount" into qt-dev
am: a105253ea8

Change-Id: I6cb7beced0de8efd8333b4233286731ed4be0ea3
2019-05-24 11:00:08 -07:00
Bin Chen
f752a6a86b Merge "[Magnifier-86] Fix deadlock causing ANR" into qt-dev
am: 0c7e69bdb6

Change-Id: Ib71dc3887e7501aa6a3abc71f0d23d2c6f5a32c5
2019-05-24 10:53:45 -07:00
Brad Ebinger
a105253ea8 Merge "Add CAPABILITY_EMERGENCY_PREFERRED in PhoneAccount" into qt-dev 2019-05-24 17:45:47 +00:00
Bin Chen
009fecb8ad Merge "[Magnifier-86] Fix deadlock causing ANR" into qt-dev
am: 0c7e69bdb6

Change-Id: I9946c147c60f1704a9af9f4d0f50cf0a4e4e2e40
2019-05-24 10:34:29 -07:00
Julia Reynolds
422b9550f7 Merge "Allow notifs from the default sms app to be blocked" into qt-dev
am: aa0eeb3857

Change-Id: Ia05ab6c68b4734dfaa4016b6b06f2c8305be56ff
2019-05-24 10:27:35 -07:00
Julia Reynolds
f23f184c87 Merge "Allow notifs from the default sms app to be blocked" into qt-dev
am: aa0eeb3857

Change-Id: Idb8b425d7da26b30a5c9b08370d84253fb1bb82a
2019-05-24 10:25:25 -07:00
Yao Chen
303c8f3ea3 Merge "Statsd: apex modules in uid map" into qt-dev
am: a36325306a

Change-Id: I0f474e569273ba6a56fe22d6786649b7e87b6721
2019-05-24 10:20:54 -07:00
Yao Chen
5c95661423 Merge "Statsd: apex modules in uid map" into qt-dev
am: a36325306a

Change-Id: Ibd1326896b0c0ec12692334b6a847f9bebd328ac
2019-05-24 10:18:51 -07:00
Lucas Dupin
9b672e1ff7 Merge "Adb command to authenticate earlier" into qt-r1-dev
am: 98f5655fc2

Change-Id: Ie3f3c4f6e3b34204d421ddcfb3a8883c6fb727ff
2019-05-24 10:13:26 -07:00
TreeHugger Robot
0c7e69bdb6 Merge "[Magnifier-86] Fix deadlock causing ANR" into qt-dev 2019-05-24 17:03:21 +00:00
Android Build Merger (Role)
347b492866 Merge "Merge "[Magnifier-84] Improve PixelCopy failures handling" into qt-dev am: 612f71b1df am: d88a953a78" into qt-r1-dev-plus-aosp 2019-05-24 17:02:44 +00:00
Android Build Merger (Role)
51947c70a7 Merge "Merge "[Magnifier-84] Improve PixelCopy failures handling" into qt-dev am: 612f71b1df am: b82fd2d7d3" into qt-r1-dev-plus-aosp 2019-05-24 17:02:23 +00:00
Mihai Popa
b56670ef6a Merge "[Magnifier-84] Improve PixelCopy failures handling" into qt-dev am: 612f71b1df
am: d88a953a78

Change-Id: I54ffb6d7bd7b98f4228da23aab7b4677778ae615
2019-05-24 10:01:25 -07:00
Mihai Popa
ffd67eb222 Merge "[Magnifier-84] Improve PixelCopy failures handling" into qt-dev am: 612f71b1df
am: b82fd2d7d3

Change-Id: I85b4a34e1fb65f6611fbeb30193ce6cc253953b2
2019-05-24 10:01:14 -07:00
Julia Reynolds
aa0eeb3857 Merge "Allow notifs from the default sms app to be blocked" into qt-dev 2019-05-24 17:00:12 +00:00
Android Build Merger (Role)
b58bbe7a58 Merge "Merge "Align bubble behavior with DND settings." into qt-dev am: 520ba6438a am: d164f94340" into qt-r1-dev-plus-aosp 2019-05-24 16:55:29 +00:00
Josh Tsuji
a021563668 Merge "Align bubble behavior with DND settings." into qt-dev am: 520ba6438a
am: d164f94340

Change-Id: I5c6fdfb82600cca77781f17e7c6d667774e20b38
2019-05-24 09:54:46 -07:00
Josh Tsuji
6d2a8e0270 Merge "Align bubble behavior with DND settings." into qt-dev am: 520ba6438a
am: f37743e533

Change-Id: I00163ee65849f77e3f1baf397f3506d573ccf575
2019-05-24 09:53:52 -07:00
Lucas Dupin
98f5655fc2 Merge "Adb command to authenticate earlier" into qt-r1-dev 2019-05-24 16:50:42 +00:00
Yao Chen
a36325306a Merge "Statsd: apex modules in uid map" into qt-dev 2019-05-24 16:48:28 +00:00
Mihai Popa
b82fd2d7d3 Merge "[Magnifier-84] Improve PixelCopy failures handling" into qt-dev
am: 612f71b1df

Change-Id: Id5b3d1a582d7119b2a967e6759d0e8e939ff20c8
2019-05-24 09:32:04 -07:00
Josh Tsuji
f37743e533 Merge "Align bubble behavior with DND settings." into qt-dev
am: 520ba6438a

Change-Id: Ieaf1e69f7c2e4d2c20b98c05992d4368a5a83d92
2019-05-24 09:24:45 -07:00
Mihai Popa
d88a953a78 Merge "[Magnifier-84] Improve PixelCopy failures handling" into qt-dev
am: 612f71b1df

Change-Id: I44978468da2e25534945596f6d750e3d4e9b49a1
2019-05-24 09:22:20 -07:00