The Android Automerger
54fae32b7c
merge in mnc-dr-release history after reset to mnc-dr-dev
2015-09-08 01:04:35 -07:00
Martijn Coenen
c2874048d0
am 5ca0c2ed
: am 624408ee
: Merge "Map realtime to clock_monotonic." into mnc-dr-dev
...
* commit '5ca0c2ede8a8d3f499dd7d27832713d4ce16d4ba':
Map realtime to clock_monotonic.
2015-09-07 07:38:29 +00:00
Martijn Coenen
5ca0c2ede8
am 624408ee
: Merge "Map realtime to clock_monotonic." into mnc-dr-dev
...
* commit '624408eecb0d278cb1de1bb088699e25b319d15e':
Map realtime to clock_monotonic.
2015-09-07 07:30:19 +00:00
Martijn Coenen
624408eecb
Merge "Map realtime to clock_monotonic." into mnc-dr-dev
2015-09-07 07:25:51 +00:00
The Android Automerger
2aa10cb4b4
merge in mnc-dr-release history after reset to mnc-dr-dev
2015-09-06 01:05:37 -07:00
Nick Armstrong-Crews
8d13427f6f
am 3c8a147c
: Merge "Add KEYCODE_SOFT_SLEEP for Ungaze." into cw-e-dev
...
* commit '3c8a147c8394a32217bb65672387d69a49a31270':
Add KEYCODE_SOFT_SLEEP for Ungaze.
2015-09-04 18:16:12 +00:00
Nick Armstrong-Crews
3c8a147c83
Merge "Add KEYCODE_SOFT_SLEEP for Ungaze." into cw-e-dev
2015-09-04 18:04:11 +00:00
Dan Stoza
e5ce0db833
am f090d598
: am 3e4c8ccc
: Merge "SF: Add colorTransform to DisplayInfo" into mnc-dr-dev
...
* commit 'f090d5985a20f13433be632beb45af8a882c0cd0':
SF: Add colorTransform to DisplayInfo
2015-09-03 22:13:25 +00:00
Dan Stoza
f090d5985a
am 3e4c8ccc
: Merge "SF: Add colorTransform to DisplayInfo" into mnc-dr-dev
...
* commit '3e4c8ccc3e5d037688ed8a1f8b69764c526e0d2f':
SF: Add colorTransform to DisplayInfo
2015-09-03 22:03:03 +00:00
Dan Stoza
3e4c8ccc3e
Merge "SF: Add colorTransform to DisplayInfo" into mnc-dr-dev
2015-09-03 21:55:36 +00:00
Prashant Malani
07da55f933
am 2f7531fb
: am 13c63825
: am e35c7d65
: Add body sensors app op for custom sensors
...
* commit '2f7531fb7a5d0c764c222f5acae0b487578629ab':
Add body sensors app op for custom sensors
2015-09-03 18:26:07 +00:00
Prashant Malani
2f7531fb7a
am 13c63825
: am e35c7d65
: Add body sensors app op for custom sensors
...
* commit '13c638255f2223cb9c455d519ff1003fc0221537':
Add body sensors app op for custom sensors
2015-09-03 18:14:43 +00:00
Prashant Malani
e8293118b9
Add body sensors app op for custom sensors
...
If the custom sensor requires the BODY SENSOR permission, we should add
the body sensors app op for the custom sensor
Bug: 23396558
Change-Id: I132917d1bca12c76c8a9fb146e00951cba3e6d7a
2015-09-03 10:44:24 -07:00
Prashant Malani
13c638255f
am e35c7d65
: Add body sensors app op for custom sensors
...
* commit 'e35c7d65bb3c226fe3c5fc5e3933f64f0963eaeb':
Add body sensors app op for custom sensors
2015-09-03 17:26:13 +00:00
Prashant Malani
e35c7d65bb
Add body sensors app op for custom sensors
...
If the custom sensor requires the BODY SENSOR permission, we should add
the body sensors app op for the custom sensor
Bug: 23396558
Change-Id: I132917d1bca12c76c8a9fb146e00951cba3e6d7a
2015-09-03 04:03:25 +00:00
Nick Armstrong-Crews
a180e855f6
Add KEYCODE_SOFT_SLEEP for Ungaze.
...
BUG: b/23589870
Change-Id: I9bb575fe97bfae926ef4db37615e88057b81480c
2015-09-02 13:00:52 -07:00
Dan Stoza
f2699fc3a8
SF: Add colorTransform to DisplayInfo
...
Adds the colorTransform field, which defines a vendor-specific color
transform (e.g., wide gamut, sRGB, etc.) to the DisplayInfo class, and
populates it from the HWC interface.
Bug: 20853317
Change-Id: I153edc36a361407656f3eb5082b96c2da2ecbec7
2015-08-31 13:41:24 -07:00
Martijn Coenen
0bcd97a748
Map realtime to clock_monotonic.
...
This maps a monotonic timestamp to the
corresponding real-time timestamp, which
can be used to match up the traces with
other logs that use real-time.
Also write clock_sync records first instead of at
the end, to avoid not being to write it due to the
buffer being full.
Bug: 23668823
Change-Id: I644aeea496197e194ec30f808f754e3e043d905f
2015-08-31 09:25:13 +00:00
The Android Automerger
727b89f74d
merge in mnc-dr-release history after reset to mnc-dr-dev
2015-08-31 01:05:35 -07:00
The Android Automerger
f34854530b
merge in mnc-dr-release history after reset to mnc-dr-dev
2015-08-29 13:06:53 -07:00
The Android Automerger
60d808a342
merge in mnc-dr-release history after reset to mnc-dr-dev
2015-08-29 01:03:21 -07:00
Glenn Kasten
8ff104ac85
Add XML for pro audio feature
...
Bug: 23604253
Change-Id: I480cf0a46c286badc6fd95a3b42e6cb1ed056b1b
2015-08-28 19:53:59 -07:00
Glenn Kasten
dd89365123
am dcdc1610
: am fb1c507b
: am 80402da0
: Add XML for pro audio feature
...
* commit 'dcdc161063640cf8666a45b8dfd6acf063476acb':
Add XML for pro audio feature
2015-08-29 00:43:56 +00:00
Glenn Kasten
dcdc161063
am fb1c507b
: am 80402da0
: Add XML for pro audio feature
...
* commit 'fb1c507b5e442fc8bac059816a3a1534152cd7c4':
Add XML for pro audio feature
2015-08-29 00:35:33 +00:00
Glenn Kasten
fb1c507b5e
am 80402da0
: Add XML for pro audio feature
...
* commit '80402da0dec36a585a014a8ca974e28ef9034722':
Add XML for pro audio feature
2015-08-29 00:25:52 +00:00
Glenn Kasten
80402da0de
Add XML for pro audio feature
...
Bug: 23604253
Change-Id: I480cf0a46c286badc6fd95a3b42e6cb1ed056b1b
2015-08-27 20:09:39 -07:00
The Android Automerger
ade9b1891a
merge in mnc-dr-release history after reset to mnc-dr-dev
2015-08-26 01:05:05 -07:00
Aravind Akella
ba3f1a27a2
am 4baa69dd
: am 8f35ca97
: SensorManager fixes.
...
* commit '4baa69ddd25296ee40e84c230af88d1fc7e229a7':
SensorManager fixes.
2015-08-25 19:12:28 +00:00
Aravind Akella
4baa69ddd2
am 8f35ca97
: SensorManager fixes.
...
* commit '8f35ca973063e1449c5ec40b618393187a47ec58':
SensorManager fixes.
2015-08-25 19:06:52 +00:00
Aravind Akella
8f35ca9730
SensorManager fixes.
...
i) Use pingBinder() to check the status of sensorservice everytime an
event_queue is created. Retry to establish the binder connection if
SensorService has recovered from a runtime restart.
ii) LOG_ALWAYS_FATAL_IF getService(SensorService) returns NULL or malloc
returns NULL.
Bug: 22634472
Change-Id: I4e3912839b6f4114be1a124510878774dbd576a4
2015-08-25 11:24:02 -07:00
The Android Automerger
bdff431536
merge in mnc-release history after reset to mnc-dev
2015-08-12 01:03:50 -07:00
The Android Automerger
0f981982fb
merge in mnc-dr-release history after reset to mnc-dr-dev
2015-08-12 01:02:37 -07:00
Mark Salyzyn
d939c96712
am df1bc670
: resolved conflicts for merge of d213f5e7
to cw-e-dev
...
* commit 'df1bc67019f4eda8acfd4b97d4c4fd98b55edcb8':
dumpstate: add logcat -b all -S
2015-08-11 23:44:46 +00:00
Mark Salyzyn
df1bc67019
resolved conflicts for merge of d213f5e7
to cw-e-dev
...
Change-Id: Iaea0fdd483b4d0988df442f9b291b99943009829
2015-08-11 16:27:05 -07:00
Mark Salyzyn
d213f5e7a4
am ecc0763e
: dumpstate: add logcat -b all -S
...
* commit 'ecc0763e6c96c418ea4ee6c993d58d16a58407b3':
dumpstate: add logcat -b all -S
2015-08-11 23:15:47 +00:00
Mark Salyzyn
ecc0763e6c
dumpstate: add logcat -b all -S
...
(cherry pick from commit e3c4df96083231b519dad919fd0ed6624100b368)
- For those that are proud to call themselves logspam police
- Every time someone declares that something is too chatty, or that
they lost their logs because they were declared too chatty and
their associated logs were aggresively pruned we generally
ask them to report the logger statistics to pinpoint what software
product that is the elephant in the room.
- Every time we want to spawn a new 'stop being so spammy' bug spawned
off a bugreport collected for another purpose, we *wish* we had the
logger statistics to help add gravitas to the claim that some piece
of software is the top, or near the top, polluter.
Bug: 22351810
Change-Id: Ifae33cd21d0ae2917a3b4381502d723725b1701c
2015-08-11 14:56:49 -07:00
The Android Automerger
f24cbc7e39
merge in mnc-release history after reset to mnc-dev
2015-08-08 01:05:16 -07:00
The Android Automerger
b33735042f
merge in mnc-dr-release history after reset to mnc-dr-dev
2015-08-08 01:03:33 -07:00
Michael Wright
e14f71efd4
am 18108fd6
: am 1362ec74
: Merge commit \'62ec2dd5\' into mm
...
* commit '18108fd6837fffff1b7c1db418d44bc7644911f1':
DO NOT MERGE Add new media navigation keys.
2015-08-07 18:07:08 +00:00
Michael Wright
18108fd683
am 1362ec74
: Merge commit \'62ec2dd5\' into mm
...
* commit '1362ec74fc4f1dc223c9c322f8f49c966ba67594':
DO NOT MERGE Add new media navigation keys.
2015-08-07 18:00:55 +00:00
Michael Wright
1362ec74fc
Merge commit '62ec2dd5' into mm
...
Change-Id: I34801df36735545fc500486209573ed2864a0430
2015-08-07 18:12:20 +01:00
Lajos Molnar
bcaa8d5a6c
OMX: clarify EOS signaling for tunneled decoders
...
Bug: 22859209
Change-Id: Ie28da1b80e4a8dd5ae2806e300ed37287c9c57a8
2015-08-07 10:10:31 -07:00
Michael Wright
62ec2dd563
DO NOT MERGE Add new media navigation keys.
...
Bug: 22059484
Change-Id: I587eb7622555194f18f403da583e3b70656a530e
2015-08-07 14:46:16 +01:00
The Android Automerger
f7cff9cde8
merge in mnc-dr-release history after reset to mnc-dr-dev
2015-08-06 01:02:55 -07:00
Dan Stoza
2121b93725
am 04eeb288
: am 50be1df7
: Merge "SF: Track missed frames and optionally drop them" into mnc-dr-dev
...
* commit '04eeb2882567412cdcec5981b50c9e7c024b03cc':
SF: Track missed frames and optionally drop them
2015-08-05 19:02:53 +00:00
Dan Stoza
04eeb28825
am 50be1df7
: Merge "SF: Track missed frames and optionally drop them" into mnc-dr-dev
...
* commit '50be1df76e2c84fc3c893ec3d3e51ba427dd3ee6':
SF: Track missed frames and optionally drop them
2015-08-05 18:55:39 +00:00
Dan Stoza
50be1df76e
Merge "SF: Track missed frames and optionally drop them" into mnc-dr-dev
2015-08-05 18:48:10 +00:00
The Android Automerger
c91b7d2ce1
merge in mnc-release history after reset to mnc-dev
2015-08-04 01:02:47 -07:00
The Android Automerger
f71a82578f
merge in mnc-dr-release history after reset to mnc-dr-dev
2015-08-04 01:01:59 -07:00
Naveen Leekha
da7645d6ab
am 7fa5c04d
: am c14a850f
: am ea2afa46
: Merge "Fix parsing of extension string" into mnc-dev
...
* commit '7fa5c04d22416a3de239beea4c0f9d20229cf10a':
Fix parsing of extension string
2015-08-03 15:05:12 +00:00