Glenn Kasten
4c51a97849
am 91b6028e
: am d44fea68
: Merge "Make IPowerManager native conform to .aidl for oneway" into lmp-dev
...
* commit '91b6028e07bc9494afc69ae4f83c3ee49de7d209':
Make IPowerManager native conform to .aidl for oneway
2014-09-08 17:04:24 +00:00
Glenn Kasten
91b6028e07
am d44fea68
: Merge "Make IPowerManager native conform to .aidl for oneway" into lmp-dev
...
* commit 'd44fea6896a54878d2ed5c9284bb3c4738fc6c54':
Make IPowerManager native conform to .aidl for oneway
2014-09-08 16:56:57 +00:00
Glenn Kasten
d44fea6896
Merge "Make IPowerManager native conform to .aidl for oneway" into lmp-dev
2014-09-08 16:33:55 +00:00
Unsuk Jung
21d4d8c548
am 323ccf6f
: am 0fef0629
: Add feature android.hardware.audio.output xml file
...
* commit '323ccf6f961a66f2503958e72ff8279df5e300e4':
Add feature android.hardware.audio.output xml file
2014-09-07 09:39:40 +00:00
Unsuk Jung
323ccf6f96
am 0fef0629
: Add feature android.hardware.audio.output xml file
...
* commit '0fef06294c1e4f0ebb6ac15ec228e96d1afe1d61':
Add feature android.hardware.audio.output xml file
2014-09-07 09:25:30 +00:00
Unsuk Jung
0fef06294c
Add feature android.hardware.audio.output xml file
...
Bug: 15318046
Change-Id: I49f0881752493ac0bad238b43ce7e1e147119528
2014-09-07 01:54:36 +00:00
Jesse Hall
e786ecab50
Merge "surfaceflinger: fix -Wunused-parameter warning"
2014-09-06 20:14:47 +00:00
Jesse Hall
12aa86a4f1
Merge "surfaceflinger: fix -Wsign-compare warnings"
2014-09-06 20:14:41 +00:00
Jesse Hall
141f0569c3
Merge "surfaceflinger: fix -Woverloaded-virtual warning"
2014-09-06 20:14:35 +00:00
Jesse Hall
c41cddb897
Merge "surfaceflinger: fix -Wmismatched-tags warnings"
2014-09-06 20:14:27 +00:00
Jesse Hall
c2522b682a
Merge "GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT"
2014-09-06 20:14:20 +00:00
Glenn Kasten
a602086872
Make IPowerManager native conform to .aidl for oneway
...
But provide a temporary escape hatch for AudioFlinger.
This oneway option will be removed as soon as possible.
Bug: 16408906
Change-Id: I20d6da1969ae05b96e72795463470eb4c1f8fbdc
2014-09-05 17:12:24 -07:00
Aravind Akella
ab1ce82009
am 71ec4a81
: am 253c4720
: Merge "SensorService flush fixes." into lmp-dev
...
* commit '71ec4a8179a3f24de04e9a6ac824d896f1835170':
SensorService flush fixes.
2014-09-05 21:33:33 +00:00
Aravind Akella
71ec4a8179
am 253c4720
: Merge "SensorService flush fixes." into lmp-dev
...
* commit '253c4720af3ac631ba04eb379aea91ecc3175cd3':
SensorService flush fixes.
2014-09-05 20:21:54 +00:00
Aravind Akella
253c4720af
Merge "SensorService flush fixes." into lmp-dev
2014-09-05 19:53:36 +00:00
Eric Laurent
1e73a2def7
am 2c1eae25
: am 437353a0
: Merge "IPowerManager: make all binder call one way" into lmp-dev
...
* commit '2c1eae259c90d5cfcb7715655f3afd59b7bea9ac':
IPowerManager: make all binder call one way
2014-09-05 18:04:49 +00:00
Eric Laurent
2c1eae259c
am 437353a0
: Merge "IPowerManager: make all binder call one way" into lmp-dev
...
* commit '437353a0ef596a59ead2dbbe419c249f1e1819e2':
IPowerManager: make all binder call one way
2014-09-05 17:53:26 +00:00
Eric Laurent
437353a0ef
Merge "IPowerManager: make all binder call one way" into lmp-dev
2014-09-05 17:30:05 +00:00
Jesse Hall
d2e514f717
surfaceflinger: fix -Wunused-parameter warning
...
warning: unused parameter 'mustRecompose' [-Wunused-parameter]
Change-Id: I6b8c671189639d851bfa5548742de988d6fa2687
2014-09-05 09:25:01 -07:00
Jesse Hall
f9bfdc6c94
surfaceflinger: fix -Wsign-compare warnings
...
warning: comparison of integers of different signs: 'int' and 'size_t'
(aka 'unsigned int') [-Wsign-compare]
arning: comparison of integers of different signs: 'int32_t' (aka
'int') and 'const uint32_t' (aka 'const unsigned int')
[-Wsign-compare]
Change-Id: I823257aa7218c5fd492a3277853210db539bb2e2
2014-09-05 09:25:01 -07:00
Eric Laurent
f20c329a8a
IPowerManager: make all binder call one way
...
make all binder call to power manager service one way so that
they don't block calling thread and are processed in the
incoming order.
Bug: 16408906.
Change-Id: I94034df7f0a36d967e085b53fdc37fff7b44757b
2014-09-05 09:14:19 -07:00
Vinod Krishnan
291f0396a5
am 708db2d0
: (-s ours) am a36d4e2d
: am 6de9f394
: (-s ours) am 8c967b9b
: DO NOT MERGE: Removing android prefix for ECG feature
...
* commit '708db2d04447e8a78258a3a0e2782c96ab00f2b2':
DO NOT MERGE: Removing android prefix for ECG feature
2014-09-04 23:57:21 +00:00
Vinod Krishnan
708db2d044
am a36d4e2d
: am 6de9f394
: (-s ours) am 8c967b9b
: DO NOT MERGE: Removing android prefix for ECG feature
...
* commit 'a36d4e2d92d5d829b913de39f60145ebc6e6df2e':
DO NOT MERGE: Removing android prefix for ECG feature
2014-09-04 23:49:37 +00:00
Vinod Krishnan
a36d4e2d92
am 6de9f394
: (-s ours) am 8c967b9b
: DO NOT MERGE: Removing android prefix for ECG feature
...
* commit '6de9f39476c6bbb1d196dbc6af23a27b177c7bf9':
DO NOT MERGE: Removing android prefix for ECG feature
2014-09-04 23:23:46 +00:00
Vinod Krishnan
6de9f39476
am 8c967b9b
: DO NOT MERGE: Removing android prefix for ECG feature
...
* commit '8c967b9bea7c80a8bd7d085fa9c9e390495dd1e8':
DO NOT MERGE: Removing android prefix for ECG feature
2014-09-04 23:11:58 +00:00
Vinod Krishnan
8c967b9bea
DO NOT MERGE: Removing android prefix for ECG feature
...
Bug: 17272904
Change-Id: Ia476bd8853e098600b681bb769536774596b9345
2014-09-04 15:53:02 -07:00
Stephen Hines
afd6b3cf7f
am c1ad526c
: am 9c0a80b8
: Merge "Fix undefined behavior (not returning a value from a function with return)." into lmp-dev
...
* commit 'c1ad526c9cc5c79c8596ce23049f56b070917895':
Fix undefined behavior (not returning a value from a function with return).
2014-09-04 22:23:18 +00:00
Michael Wright
22371776ff
am 41943dd0
: am 9e24c319
: Merge "Fix type for temp variable" into lmp-dev
...
* commit '41943dd027740873180bea8d30b65d71f0077654':
Fix type for temp variable
2014-09-04 22:23:17 +00:00
Stephen Hines
c1ad526c9c
am 9c0a80b8
: Merge "Fix undefined behavior (not returning a value from a function with return)." into lmp-dev
...
* commit '9c0a80b8f48ba3a183afff5820f4ffad29b31224':
Fix undefined behavior (not returning a value from a function with return).
2014-09-04 22:09:07 +00:00
Michael Wright
41943dd027
am 9e24c319
: Merge "Fix type for temp variable" into lmp-dev
...
* commit '9e24c319c3c8395b6dbd57d4cc8e0c749bbbb82c':
Fix type for temp variable
2014-09-04 22:09:07 +00:00
Stephen Hines
9c0a80b8f4
Merge "Fix undefined behavior (not returning a value from a function with return)." into lmp-dev
2014-09-04 21:50:47 +00:00
Michael Wright
9e24c319c3
Merge "Fix type for temp variable" into lmp-dev
2014-09-04 21:47:00 +00:00
Jesse Hall
382574d116
surfaceflinger: fix -Woverloaded-virtual warning
...
warning: 'android::LayerDim::isOpaque' hides overloaded virtual function
[-Woverloaded-virtual]
Change-Id: Ie27a6c943f485bc89ce11e424a4e7d99805d4dd0
2014-09-04 10:07:28 -07:00
Jesse Hall
646f541050
surfaceflinger: fix -Wmismatched-tags warnings
...
warning: struct 'HWComposer' was previously declared as a class
[-Wmismatched-tags]
warning: class 'DisplayInfo' was previously declared as a struct
[-Wmismatched-tags]
Change-Id: I13db9f8aab3a957ce8ff8d64598dae1807d6fe7e
2014-09-04 10:07:28 -07:00
Jesse Hall
46a1f6b40e
GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT
...
Change-Id: I4dcb57a0db9ee3c5222cd453c9213859384212b0
2014-09-04 10:07:28 -07:00
Stephen Hines
457296ad6c
Fix undefined behavior (not returning a value from a function with return).
...
Bug: 17379740
This function was missing a return statement, even though it declares a return
type. This is undefined behavior, which clang miscompiled into just falling
through to a later function in some cases. Adding the return statement
fixes the undefined behavior (and probably fixes a bug too).
Change-Id: I05c03b6473b831769dc4fa8b5ba43fb4249f7626
2014-09-04 15:52:47 +00:00
Aravind Akella
9e3adfcebf
SensorService flush fixes.
...
i) Fix a possible race condition when adding a pending flush connection
to mActiveSensors data structure.
ii) Invalidate flush_complete_events as soon as they are consumed by a
connection so that they are not used by other connections which are
registered for the same sensor.
Change-Id: I1491bea8c2081c4aab1feacc60add13b7aa26bb7
2014-09-03 18:24:05 -07:00
David Smith
41088d9e9f
Merge "Add RGBA8888 to OMX_COLOR_FORMATTYPE"
2014-09-03 23:18:04 +00:00
David Smith
01cb166a53
Add RGBA8888 to OMX_COLOR_FORMATTYPE
...
Change-Id: Ie3d2c7012e48b694f438c90e6a06949076c4b559
2014-09-03 15:10:20 -07:00
Hans Boehm
18ec6fe4e4
am 2db0e2b1
: am 98e56d92
: Merge "Fix CAS argument type." into lmp-dev
...
* commit '2db0e2b161a22542047d87527a75f9f80e90f465':
Fix CAS argument type.
2014-09-03 19:23:55 +00:00
Wally Yau
07815f2989
am 3aa066e9
: am 19f8b79f
: Merge "New keycode definitions for TV remotes." into lmp-dev
...
* commit '3aa066e9d7480f0be806ac2d9f92bbb22771477b':
New keycode definitions for TV remotes.
2014-09-03 19:23:54 +00:00
Hans Boehm
2db0e2b161
am 98e56d92
: Merge "Fix CAS argument type." into lmp-dev
...
* commit '98e56d926bce70a0a3257c573a92944c8057b528':
Fix CAS argument type.
2014-09-03 17:37:03 +00:00
Wally Yau
3aa066e9d7
am 19f8b79f
: Merge "New keycode definitions for TV remotes." into lmp-dev
...
* commit '19f8b79f154b64c664e974f7be067d456c3d57e2':
New keycode definitions for TV remotes.
2014-09-03 17:37:02 +00:00
Hans Boehm
98e56d926b
Merge "Fix CAS argument type." into lmp-dev
2014-09-03 17:18:44 +00:00
Wally Yau
19f8b79f15
Merge "New keycode definitions for TV remotes." into lmp-dev
2014-09-03 17:15:38 +00:00
Hans Boehm
78b26747e2
am 4a29a80f
: resolved conflicts for merge of 08ff8021
to lmp-dev-plus-aosp
...
* commit '4a29a80fff163a86959be2e3eb0f4a9d739b5f7d':
Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""
2014-09-03 13:49:01 +00:00
Hans Boehm
553231f65e
Fix CAS argument type.
...
Gcc apparently doesn't check; clang does.
Bug:17067219
Change-Id: I184084a5063131dbc857c63f97e70e78a05e1a76
(cherry picked from commit 1ddaadb598
)
2014-09-02 23:26:16 -07:00
Hans Boehm
4a29a80fff
resolved conflicts for merge of 08ff8021
to lmp-dev-plus-aosp
...
Change-Id: I7b57ce5e7d32f6ba4372d7b4af590cc74fd2c7e8
2014-09-02 23:08:28 -07:00
Hans Boehm
08ff802151
Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""
...
After fixing b/16874785.
This reverts commit f010a05c7e
.
Original comment, which actually describes the effect of this:
Change the mExtras field in Binder.h to be a stdatomic.h atomic
value, and replace references to it with proper stdatomic.h calls.
This removes one of a small number of remaining 64 bit
android_atomic references. It also replaces the erroneously
non-atomic read accesses to mExtras.
It would be better if this used the C++11 <atomic> facility,
but we don't quite have that yet.
Fixes
Bug:16513433
Change-Id: I1645ca5d6f60595bf5d388913665ce4b8780b26d
(cherry picked from commit 3effababf2
)
2014-09-02 16:11:46 -07:00
ASAZU, Hideki
5b3dc861fb
New keycode definitions for TV remotes.
...
Keys which are necessary for supporting world-wide broadcast
standard or used commonly for TV/STB remotes.
Change-Id: I2721ceb7d956c87f1d4106b99f9d21947ae13d47
2014-09-02 13:48:25 -07:00