Commit Graph

372491 Commits

Author SHA1 Message Date
Evan Rosky
e220f456ac Merge "Update surface position once created." into pi-dev am: 8a4af9c3e8
am: 85602dae12

Change-Id: I184b4d9545b11498b891e7442c3b92b4b27a3b59
2018-04-23 16:05:38 -07:00
Evan Rosky
85602dae12 Merge "Update surface position once created." into pi-dev
am: 8a4af9c3e8

Change-Id: If8b087c21f5b3da6c701c03b814a081c8371c0d5
2018-04-23 15:55:48 -07:00
Anton Hansson
174ce32a4d [automerger skipped] Merge "Move frameworks/base off the SRC_API_DIR variable." am: 2a4277fb00 am: 5629dc7849 -s ours
am: b583679038  -s ours

Change-Id: Ib75e866a659e2835ea3e317b02e64e3af9f7e695
2018-04-23 15:53:36 -07:00
Winson Chung
131ac05712 Merge "Add windowing mode to task snapshot." into pi-dev am: 167710981c
am: ec1e188e67

Change-Id: If2193c37570deb762d7ae74fcbda4c3d9fd61729
2018-04-23 15:46:34 -07:00
TreeHugger Robot
8a4af9c3e8 Merge "Update surface position once created." into pi-dev 2018-04-23 22:41:50 +00:00
Anton Hansson
b583679038 [automerger skipped] Merge "Move frameworks/base off the SRC_API_DIR variable." am: 2a4277fb00
am: 5629dc7849  -s ours

Change-Id: Ie28cc127204e11f965e6e1898c856795169c005f
2018-04-23 15:36:34 -07:00
Jason Monk
05997fb590 Merge "Revert "Revert "Clear out tuner prefs since it is disabled""" into pi-dev am: 2897fd315d
am: 6857a57459

Change-Id: I51881463579f56dcb158f7bfe161343df5337f0d
2018-04-23 15:33:47 -07:00
Winson Chung
ec1e188e67 Merge "Add windowing mode to task snapshot." into pi-dev
am: 167710981c

Change-Id: I0348be9f7e096e7effc1476f5015d33263a163fe
2018-04-23 15:30:23 -07:00
Anton Hansson
5629dc7849 Merge "Move frameworks/base off the SRC_API_DIR variable."
am: 2a4277fb00

Change-Id: I7912e0aec15b478cff139c8312893d418c360ef2
2018-04-23 15:21:58 -07:00
Jason Monk
6857a57459 Merge "Revert "Revert "Clear out tuner prefs since it is disabled""" into pi-dev
am: 2897fd315d

Change-Id: I28fbfda37088bb1801396d62e184afa6ddf2ae43
2018-04-23 15:21:28 -07:00
Winson Chung
167710981c Merge "Add windowing mode to task snapshot." into pi-dev 2018-04-23 22:16:01 +00:00
Sudheer Shanka
53370a7894 Merge "Rate limit battery external stats collection in takeUidSnapshot(s)." into pi-dev am: 6bc6e21be7
am: ec9e20a1d9

Change-Id: Ifbc3b63ce0173c7f066ed3f5a360c0cca53f1814
2018-04-23 15:08:39 -07:00
TreeHugger Robot
2897fd315d Merge "Revert "Revert "Clear out tuner prefs since it is disabled""" into pi-dev 2018-04-23 22:08:31 +00:00
Android Build Merger (Role)
3862450ae8 Merge "Merge "Merge "BluetoothManagerService: Add dumpsys logs for BLE_ON -> OFF" am: 361ab2c581 am: 6dfacdcaf2" into pi-dev-plus-aosp am: 654bb79e25" 2018-04-23 21:58:17 +00:00
Hansong Zhang
11ddc40329 Merge "Merge "BluetoothManagerService: Add dumpsys logs for BLE_ON -> OFF" am: 361ab2c581 am: 6dfacdcaf2" into pi-dev-plus-aosp
am: 654bb79e25

Change-Id: Ieb697253ea88dc965bb6ee097dcf56204cc529a3
2018-04-23 14:56:58 -07:00
TreeHugger Robot
f4edda2de1 Merge "Remove redundant regex operators used in tests" 2018-04-23 21:56:02 +00:00
Sudheer Shanka
ec9e20a1d9 Merge "Rate limit battery external stats collection in takeUidSnapshot(s)." into pi-dev
am: 6bc6e21be7

Change-Id: I50eba3f8c2171c511e0b1ecd3d0e605956e97d24
2018-04-23 14:52:01 -07:00
Android Build Merger (Role)
b63a513aa6 Merge "Merge "Fix RadioTunerTest." into pi-dev am: 1fdddabc24 am: f970cde420" 2018-04-23 21:45:54 +00:00
Tomasz Wasilczyk
ae2a1d9503 Merge "Fix RadioTunerTest." into pi-dev am: 1fdddabc24
am: f970cde420

Change-Id: I245865e6a54a0468b19404094ab718f410e4ad31
2018-04-23 14:45:34 -07:00
TreeHugger Robot
64c1e890f0 Merge "Use the right printf symbols rather than converting to ints." 2018-04-23 21:44:34 +00:00
Android Build Merger (Role)
654bb79e25 Merge "Merge "BluetoothManagerService: Add dumpsys logs for BLE_ON -> OFF" am: 361ab2c581 am: 6dfacdcaf2" into pi-dev-plus-aosp 2018-04-23 21:35:47 +00:00
Hansong Zhang
8b4e238882 Merge "BluetoothManagerService: Add dumpsys logs for BLE_ON -> OFF" am: 361ab2c581
am: 6dfacdcaf2

Change-Id: Ic69f60a8c2dcc9677faa2ab51c03758a823bde31
2018-04-23 14:35:26 -07:00
Victor Hsieh
9d7e201472 [automerger skipped] Merge "Verify best signature algorithms of all signers" into pi-dev am: c17a171a7b
am: a81b3fec24  -s ours

Change-Id: I2eeeeaf5218be1499f6d07a27ac3671b4b7ea919
2018-04-23 14:35:06 -07:00
Sudheer Shanka
6bc6e21be7 Merge "Rate limit battery external stats collection in takeUidSnapshot(s)." into pi-dev 2018-04-23 21:34:57 +00:00
Tomasz Wasilczyk
f970cde420 Merge "Fix RadioTunerTest." into pi-dev
am: 1fdddabc24

Change-Id: If00335a9b49d4a8ed6a609f144bc2c00b529c184
2018-04-23 14:32:23 -07:00
Victor Hsieh
a81b3fec24 Merge "Verify best signature algorithms of all signers" into pi-dev
am: c17a171a7b

Change-Id: I05d0dd847c93fdcd594880bc7743fe31a55d2855
2018-04-23 14:26:41 -07:00
Amin Shaikh
bc74545dbb Merge "Use screen height to determine # of QS rows." into pi-dev am: 9376380a27
am: 71422f3c9b

Change-Id: Ib4e38dff09204a4e01fd859c6c93d332c8d7c736
2018-04-23 14:26:33 -07:00
Hansong Zhang
6dfacdcaf2 Merge "BluetoothManagerService: Add dumpsys logs for BLE_ON -> OFF"
am: 361ab2c581

Change-Id: I38d9e8258a0ebab18c1e8565f5b4a0a12baa3deb
2018-04-23 14:25:27 -07:00
Amin Shaikh
71422f3c9b Merge "Use screen height to determine # of QS rows." into pi-dev
am: 9376380a27

Change-Id: I8962708b492513e1392515580b2936191d97e9e9
2018-04-23 14:19:45 -07:00
TreeHugger Robot
1fdddabc24 Merge "Fix RadioTunerTest." into pi-dev 2018-04-23 21:19:42 +00:00
TreeHugger Robot
c17a171a7b Merge "Verify best signature algorithms of all signers" into pi-dev 2018-04-23 21:15:31 +00:00
TreeHugger Robot
9376380a27 Merge "Use screen height to determine # of QS rows." into pi-dev 2018-04-23 21:07:45 +00:00
Sam Hasinoff
98ded07bd5 Merge "Fix bad pixel out-of-bounds filter" into pi-dev am: c3a7ab321b
am: e98cc4ad37

Change-Id: Id1fdc09dd05d93f83557d121decc338f10202410
2018-04-23 13:43:43 -07:00
Rohan Shah
fce3446ce1 Merge "[QS] Move date view to QS panel" into pi-dev am: ef61802559
am: 0e309f0b97

Change-Id: I5e54bda59d4a8fa5b425e5d06aa804334fa9bce1
2018-04-23 13:32:32 -07:00
Sam Hasinoff
e98cc4ad37 Merge "Fix bad pixel out-of-bounds filter" into pi-dev
am: c3a7ab321b

Change-Id: I3f1658f81c6735c79511f8544ebdc6212f82a96b
2018-04-23 13:32:11 -07:00
Rohan Shah
0e309f0b97 Merge "[QS] Move date view to QS panel" into pi-dev
am: ef61802559

Change-Id: I040de09a68a6791540765b3d8c7323f604bc4100
2018-04-23 13:24:30 -07:00
Marco Nelissen
9cc3104f8c Merge "Guard against native crash due to null Surface" into pi-dev am: a98bb36fed
am: 34dd1000db

Change-Id: I3758948149fb9c50732782b86b2d330e80b94e64
2018-04-23 13:21:44 -07:00
TreeHugger Robot
c3a7ab321b Merge "Fix bad pixel out-of-bounds filter" into pi-dev 2018-04-23 20:17:58 +00:00
Anton Hansson
2a4277fb00 Merge "Move frameworks/base off the SRC_API_DIR variable." 2018-04-23 20:16:57 +00:00
TreeHugger Robot
ef61802559 Merge "[QS] Move date view to QS panel" into pi-dev 2018-04-23 20:15:24 +00:00
Marco Nelissen
34dd1000db Merge "Guard against native crash due to null Surface" into pi-dev
am: a98bb36fed

Change-Id: I9cb3e75cdd72592250f755a575c138ecedd3a51b
2018-04-23 13:12:06 -07:00
Rob Carr
c593d45451 Merge "ViewRoot: Check Surface validity before initializing renderer from draw()." into pi-dev am: cef96f69d7
am: c595c5c044

Change-Id: I7d364bdb71b47d1400a5db1775966fe6a6daa02b
2018-04-23 13:07:12 -07:00
Yi Jin
8cb370f2a2 Use the right printf symbols rather than converting to ints.
Bug: 77333635
Test: make -j incidentd
Change-Id: I3338279c385051b5df334af481e7f47f16d16480
2018-04-23 13:03:14 -07:00
Artem Iglikov
6f3f0a3132 [automerger skipped] Merge "DO NOT MERGE Add list of approved services in addApprovedList" into pi-dev am: 7f352dbeaf
am: f17d6e3010  -s ours

Change-Id: I16f1ac17063fefe9d25d0442704880e2090a9aa5
2018-04-23 13:02:26 -07:00
Treehugger Robot
361ab2c581 Merge "BluetoothManagerService: Add dumpsys logs for BLE_ON -> OFF" 2018-04-23 20:01:02 +00:00
Marco Nelissen
a98bb36fed Merge "Guard against native crash due to null Surface" into pi-dev 2018-04-23 19:58:46 +00:00
Sunny Goyal
a1668764b5 Merge "Exposing setRecentsVisibility method and associated callbacks to the Recents components" into pi-dev am: 9d5eb3453f
am: 97abef6da0

Change-Id: Ib42036805eebbc2f6981a931e4ae7eebb4bb5711
2018-04-23 12:58:35 -07:00
Alison Cichowlas
2de33751f3 Merge "Global actions visuals:" into pi-dev am: a52c08a7af
am: ce0300fbe3

Change-Id: I85baad128659b2cf9c03252e1cd45c553ebdd0cf
2018-04-23 12:50:11 -07:00
Rob Carr
c595c5c044 Merge "ViewRoot: Check Surface validity before initializing renderer from draw()." into pi-dev
am: cef96f69d7

Change-Id: I3d7857f31bfe9bba3bde78bef67f08c7b24338c6
2018-04-23 12:43:23 -07:00
Artem Iglikov
f17d6e3010 Merge "DO NOT MERGE Add list of approved services in addApprovedList" into pi-dev
am: 7f352dbeaf

Change-Id: I8c54851ba1118185d0a775603a0122749e3fec79
2018-04-23 12:31:17 -07:00