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
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
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
Michael Wright
53047e593d
am 883fccb5
: am bcbf97ef
: Add logging for switch state
...
* commit '883fccb5f89c005502af27a18322f9fa302ac1b3':
Add logging for switch state
2014-09-02 07:09:26 +00:00
Michael Wright
883fccb5f8
am bcbf97ef
: Add logging for switch state
...
* commit 'bcbf97ef8fb6eaf527014ed9e7d979ad4fe9fdd2':
Add logging for switch state
2014-08-29 23:52:43 +00:00
Michael Wright
3da3b8436c
Fix type for temp variable
...
Change-Id: I8e2d229da326e5182692f94660336169fb249da7
2014-08-29 16:16:26 -07:00
Michael Wright
bcbf97ef8f
Add logging for switch state
...
Bug: 17004602
Change-Id: I15c9feb7b28274183742936c20e34e7fb07e0b70
2014-08-29 14:31:32 -07:00
Alex Light
bdf410a8c2
am e6b643da
: am 8b17ac6b
: Remove obsolete prunedexcache
...
* commit 'e6b643da8170a39e4810866e6a9f5c9c9cc767e2':
Remove obsolete prunedexcache
2014-08-29 19:12:59 +00:00
Alex Light
e6b643da81
am 8b17ac6b
: Remove obsolete prunedexcache
...
* commit '8b17ac6bd6b5114babac619cad3ff03fbf10a953':
Remove obsolete prunedexcache
2014-08-29 18:47:40 +00:00
Brian Carlstrom
60373e0802
am ad2a4083
: am 8c1642ad
: Merge "Remove obsolete prunedexcache"
...
* commit 'ad2a4083fe4010c282999a2c3a8795665ae6a5e9':
Remove obsolete prunedexcache
2014-08-29 11:56:56 +00:00
Brian Carlstrom
ad2a4083fe
am 8c1642ad
: Merge "Remove obsolete prunedexcache"
...
* commit '8c1642ad4ea8fbeb7d03f30e5f50e03c28d40065':
Remove obsolete prunedexcache
2014-08-29 11:39:54 +00:00
Alex Light
8b17ac6bd6
Remove obsolete prunedexcache
...
Bug: 16875245
(cherry picked from commit 5f727f8694
)
Change-Id: I06e14c405aa4af295795982c1d236be3cb00e893
2014-08-28 16:54:54 -07:00
Brian Carlstrom
8c1642ad4e
Merge "Remove obsolete prunedexcache"
2014-08-28 23:45:12 +00:00
Alex Light
5f727f8694
Remove obsolete prunedexcache
...
Bug: 16875245
Change-Id: I06e14c405aa4af295795982c1d236be3cb00e893
2014-08-28 23:30:52 +00:00
Jae Seo
f238ebbf0a
am 93b1369e
: am a01730f6
: Add android.software.live_tv feature
...
* commit '93b1369e5d1d71749165aeba31d987f2c9ef6729':
Add android.software.live_tv feature
2014-08-28 23:18:35 +00:00
Jae Seo
93b1369e5d
am a01730f6
: Add android.software.live_tv feature
...
* commit 'a01730f65b0e9b29c29772b7d83101fbd8f1ad75':
Add android.software.live_tv feature
2014-08-28 23:02:14 +00:00
Jae Seo
a01730f65b
Add android.software.live_tv feature
...
Bug: 17284986
Change-Id: I777d045f61a50f7ea473cb26bb509123c440587a
2014-08-28 12:54:17 -07:00
Eric Penner
b207e95b46
am 57782cd2
: am 5c4a1566
: Merge "GLConsumer: Fix eglTerminate/eglInit edge case." into lmp-dev
...
* commit '57782cd25539aa163b885cd336144d4c8bc9f665':
GLConsumer: Fix eglTerminate/eglInit edge case.
2014-08-27 18:35:43 +00:00
Jeff Sharkey
afde76c0c6
am 18a9457e
: am 7903c6a2
: Merge "Make clear data stricter." into lmp-dev
...
* commit '18a9457edde6163539338e05a31c3431bc747c5f':
Make clear data stricter.
2014-08-27 18:35:42 +00:00
Eric Penner
57782cd255
am 5c4a1566
: Merge "GLConsumer: Fix eglTerminate/eglInit edge case." into lmp-dev
...
* commit '5c4a15665968471ddbac0b476514d00503e997c7':
GLConsumer: Fix eglTerminate/eglInit edge case.
2014-08-27 18:26:20 +00:00
Jeff Sharkey
18a9457edd
am 7903c6a2
: Merge "Make clear data stricter." into lmp-dev
...
* commit '7903c6a263354506ace10fc32aa65c231b64f62b':
Make clear data stricter.
2014-08-27 18:26:20 +00:00
Eric Penner
5c4a156659
Merge "GLConsumer: Fix eglTerminate/eglInit edge case." into lmp-dev
2014-08-27 18:07:04 +00:00
Jeff Sharkey
7903c6a263
Merge "Make clear data stricter." into lmp-dev
2014-08-27 17:58:35 +00:00
Jeff Sharkey
3316fe472f
Make clear data stricter.
...
It should nuke everything under the data directory. PMS will come
around and generate the lib symlink after we're finished.
Bug: 16739202
Change-Id: Ib70af2e1450e3bed6781fb497b9cc67e1e594c49
2014-08-27 10:46:28 -07:00
Calin Juravle
ac6987417f
am 7330016a
: am 97477d20
: Set compiler filter flag to true when vmSafeMode is present.
...
* commit '7330016a75085631064daab303e1efe583f75125':
Set compiler filter flag to true when vmSafeMode is present.
2014-08-27 17:06:32 +00:00
Calin Juravle
4d09213c1c
am 8694bc36
: am f6e1611a
: (-s ours) Merge "Add vm_safe_mode to dexopt."
...
* commit '8694bc366f93a76c52f1c71dfc1d9f9fb896bcac':
Add vm_safe_mode to dexopt.
2014-08-27 17:06:18 +00:00
Calin Juravle
7330016a75
am 97477d20
: Set compiler filter flag to true when vmSafeMode is present.
...
* commit '97477d203eaf0c3235bbe2415356f20a0431cada':
Set compiler filter flag to true when vmSafeMode is present.
2014-08-27 16:33:27 +00:00
Calin Juravle
8694bc366f
am f6e1611a
: (-s ours) Merge "Add vm_safe_mode to dexopt."
...
* commit 'f6e1611a8d7990779152539e866bf8524527469f':
Add vm_safe_mode to dexopt.
2014-08-27 16:07:25 +00:00