Michael Kwan
5c30475094
Merge \"Temp fix to split header and position count behaviour for watches.\" into nyc-mr1-dev
...
am: 5985e3f92f
2016-06-11 00:13:22 +00:00
TreeHugger Robot
5985e3f92f
Merge "Temp fix to split header and position count behaviour for watches." into nyc-mr1-dev
2016-06-11 00:06:56 +00:00
Adam Lesinski
e9fdfb6334
Merge \\"BatteryStats: Fix read/write parcel order\\" into nyc-dev am: e8a442ccd6
...
am: 860e09ddce
2016-06-10 22:47:46 +00:00
Adam Lesinski
860e09ddce
Merge \"BatteryStats: Fix read/write parcel order\" into nyc-dev
...
am: e8a442ccd6
2016-06-10 22:43:45 +00:00
Adam Lesinski
e8a442ccd6
Merge "BatteryStats: Fix read/write parcel order" into nyc-dev
2016-06-10 22:29:15 +00:00
Adam Lesinski
67c134f849
BatteryStats: Fix read/write parcel order
...
Also moves discharge coulomb data to BATTERY_DISCHARGE_DATA checkin line.
Bug:29264326
Bug:28743761
Change-Id: I78881e166c11f40b2397e04d2cab8d5200c71eea
2016-06-10 15:24:16 -07:00
Eino-Ville Talvala
be84d6da6c
Merge changes I069e2b7e,Ic5e9e58a into nyc-dev am: f4de8dd77c
...
am: 2c21b5b651
2016-06-10 20:13:14 +00:00
Eino-Ville Talvala
2c21b5b651
Merge changes I069e2b7e,Ic5e9e58a into nyc-dev
...
am: f4de8dd77c
2016-06-10 20:02:20 +00:00
Eino-Ville Talvala
f4de8dd77c
Merge changes I069e2b7e,Ic5e9e58a into nyc-dev
...
* changes:
Camera2: Fix error codes for CameraDevice.StateCallback.onError()
Camera2: Protect MarshalRegistry against concurrent access
2016-06-10 19:44:04 +00:00
Michael Kwan
937035ef57
Temp fix to split header and position count behaviour for watches.
...
Bug: 29010414
Bug: 29244476
Change-Id: I5c8616304e7d44f423636612670d9187ad030679
2016-06-10 12:01:23 -07:00
John Reck
b3b6d96ed4
Merge \\"Don\\'t call surfaceCreated for just changed surfaces\\" into nyc-dev am: e4b1fb94e3
...
am: 93ff5124c6
2016-06-10 18:07:11 +00:00
John Reck
b8dac11e5a
Merge \"Don\'t call surfaceCreated for just changed surfaces\" into nyc-dev
...
am: e4b1fb94e3
2016-06-10 18:02:57 +00:00
John Reck
93ff5124c6
Merge \"Don\'t call surfaceCreated for just changed surfaces\" into nyc-dev
...
am: e4b1fb94e3
2016-06-10 18:02:20 +00:00
John Reck
e4b1fb94e3
Merge "Don't call surfaceCreated for just changed surfaces" into nyc-dev
2016-06-10 17:46:54 +00:00
Eino-Ville Talvala
50eebe057b
Camera2: Fix error codes for CameraDevice.StateCallback.onError()
...
Existing code assumed that ICameraDeviceCallbacks and
CameraDevice.StateCallback have the same error code values for matching
errors.
They do not.
Also remove duplicate error code definitions now present in the AIDL
file for ICameraDeviceCallbacks.
Bug: 29248704
Change-Id: I069e2b7ef3be7887634e128f1accb50b7558f3fd
2016-06-10 10:28:34 -07:00
Eino-Ville Talvala
4a2c7c5549
Camera2: Protect MarshalRegistry against concurrent access
...
Multiple CameraMetadataNative objects could be reading and writing
to the metadata marshaler registry simultaneously.
This can lead to an infinite loop in the HashMap in the worst case,
so add synchronization against this.
Bug: 29043079
Change-Id: Ic5e9e58a9333b99b4bea87bf790c9fbfadfbbea9
2016-06-10 10:28:34 -07:00
Tianjie Xu
0578d40bca
Merge \\"Collect statistics of source build version\\" into nyc-dev am: 8872a604b9
...
am: 3287c5f380
2016-06-10 17:27:06 +00:00
Tianjie Xu
9331178a6d
Merge \"Collect statistics of source build version\" into nyc-dev
...
am: 8872a604b9
2016-06-10 17:23:25 +00:00
Tianjie Xu
3287c5f380
Merge \"Collect statistics of source build version\" into nyc-dev
...
am: 8872a604b9
2016-06-10 17:19:32 +00:00
Tianjie Xu
8872a604b9
Merge "Collect statistics of source build version" into nyc-dev
2016-06-10 17:13:54 +00:00
Todd Kennedy
db6cd50708
Merge \"fix prefix generation\" into nyc-mr1-dev
...
am: 0f8427773e
2016-06-10 16:08:47 +00:00
TreeHugger Robot
0f8427773e
Merge "fix prefix generation" into nyc-mr1-dev
2016-06-10 16:00:41 +00:00
Adam Lesinski
334d6f35b5
Merge \\"BatteryStats: Record fine grained battery discharge\\" into nyc-dev am: 094c40b2cc
...
am: ae903e100f
2016-06-10 02:24:53 +00:00
Adam Lesinski
d499d79b07
Merge \"BatteryStats: Record fine grained battery discharge\" into nyc-dev
...
am: 094c40b2cc
2016-06-10 02:21:54 +00:00
Adam Lesinski
ae903e100f
Merge \"BatteryStats: Record fine grained battery discharge\" into nyc-dev
...
am: 094c40b2cc
2016-06-10 02:21:50 +00:00
TreeHugger Robot
094c40b2cc
Merge "BatteryStats: Record fine grained battery discharge" into nyc-dev
2016-06-10 02:12:23 +00:00
Adam Lesinski
aa461cb7d2
Merge \\"BatteryStats: Bump checkin format version to 18\\" into nyc-dev am: d75bc225ac
...
am: 21b6b2a2d1
2016-06-10 01:08:06 +00:00
Adam Lesinski
21b6b2a2d1
Merge \"BatteryStats: Bump checkin format version to 18\" into nyc-dev
...
am: d75bc225ac
2016-06-10 01:05:08 +00:00
Adam Lesinski
69a983dfec
Merge \"BatteryStats: Bump checkin format version to 18\" into nyc-dev
...
am: d75bc225ac
2016-06-10 01:05:03 +00:00
Adam Lesinski
d75bc225ac
Merge "BatteryStats: Bump checkin format version to 18" into nyc-dev
2016-06-10 00:53:44 +00:00
Adam Lesinski
b55d741c9a
BatteryStats: Bump checkin format version to 18
...
Bug:28811636
Change-Id: If2229c438e60f20746c91bccbcaa6d72ca5f0802
2016-06-09 17:46:19 -07:00
Adam Lesinski
3ee3f63eb8
BatteryStats: Record fine grained battery discharge
...
For devices that report battery discharge via a coulomb counter,
record how much of the battery was discharged while the screen
was on/off.
Bug:28743761
Change-Id: Ie2d1708864352029ff466c1fed14fc057e19b93b
2016-06-09 17:37:22 -07:00
Phil Weaver
4b82db9d9c
Merge \\"Improve accessibility window title behavior\\" into nyc-dev am: f8af34365c
...
am: d567ae1b87
2016-06-09 23:49:20 +00:00
Phil Weaver
e2b3248823
Merge \"Improve accessibility window title behavior\" into nyc-dev
...
am: f8af34365c
2016-06-09 23:42:47 +00:00
Doris Liu
7da4903bf9
Merge changes from topic \'VectorDrawable polishing cherrypicks from master\' into nyc-mr1-dev
...
am: ea06280b3e
2016-06-09 23:42:16 +00:00
Phil Weaver
d567ae1b87
Merge \"Improve accessibility window title behavior\" into nyc-dev
...
am: f8af34365c
2016-06-09 23:41:45 +00:00
Doris Liu
ea06280b3e
Merge changes from topic 'VectorDrawable polishing cherrypicks from master' into nyc-mr1-dev
...
* changes:
Support Keyframe definition for AVD on RT
Throw Exception for wrong valueType with API guard
2016-06-09 23:33:51 +00:00
Phil Weaver
f8af34365c
Merge "Improve accessibility window title behavior" into nyc-dev
2016-06-09 23:32:10 +00:00
John Reck
208c47cfb0
Don't call surfaceCreated for just changed surfaces
...
Fixes: 29223302
If the surface only changed we want to just call onSurfaceChanged,
not onSurfaceCreated.
Change-Id: I65c8b210a7e34eaa2862020335ee7f6ef56eeac2
2016-06-09 16:26:21 -07:00
Tianjie Xu
c1ff246f1a
Collect statistics of source build version
...
Parse the last_install and report the source build version of an ota
update.
Related CL in: ag/1121141
Bug: 28658632
Change-Id: I5e835c144aabe97fda681f60397ebf4416f7bd4f
2016-06-09 16:00:11 -07:00
Dianne Hackborn
773a45272b
Merge \\"Fix more of issue #28689719 : Runtime restart\\" into nyc-dev am: 4781525399
...
am: 6d8e471072
2016-06-09 22:26:49 +00:00
Dianne Hackborn
a2cb7a0ef3
Merge \"Fix more of issue #28689719 : Runtime restart\" into nyc-dev
...
am: 4781525399
2016-06-09 22:22:48 +00:00
Todd Kennedy
e2e1ef0581
fix prefix generation
...
when performing bitwise operations, java promotes byte's to int's.
this is normally okay except when the value is negative. in that
case, java extends the sign bits. this means that after shifting,
all of the upper bits are most likely going to be all f's. instead,
undo the sign extension by pulling out just the 8 bits we're
interested in.
Change-Id: I89f7244f6b675be2cca4a185a7002b5f8a6eece1
2016-06-09 15:22:15 -07:00
Dianne Hackborn
6d8e471072
Merge \"Fix more of issue #28689719 : Runtime restart\" into nyc-dev
...
am: 4781525399
2016-06-09 22:22:00 +00:00
Chris Tate
3b2e584686
Merge \\"Turn down factory-default lock wallpaper support\\" into nyc-dev am: 52e323bd38
...
am: 4676cc96ac
2016-06-09 22:16:39 +00:00
Dianne Hackborn
4781525399
Merge "Fix more of issue #28689719 : Runtime restart" into nyc-dev
2016-06-09 22:16:27 +00:00
Christopher Tate
f252ef9ec1
Merge \"Turn down factory-default lock wallpaper support\" into nyc-dev
...
am: 52e323bd38
2016-06-09 22:13:43 +00:00
Christopher Tate
4676cc96ac
Merge \"Turn down factory-default lock wallpaper support\" into nyc-dev
...
am: 52e323bd38
2016-06-09 22:13:32 +00:00
Chris Tate
52e323bd38
Merge "Turn down factory-default lock wallpaper support" into nyc-dev
2016-06-09 22:07:00 +00:00
Doris Liu
09087eaac9
Merge \"Handle hidden RT VectorDrawable animators\" into nyc-mr1-dev
...
am: 3f6a95283a
2016-06-09 21:44:01 +00:00
