OSDN Git Service
Dan Albert [Tue, 9 Sep 2014 05:25:03 +0000 (05:25 +0000)]
am
5273a978: resolved conflicts for merge of
86aeb9ef to lmp-dev-plus-aosp
* commit '
5273a978337cbee2c1aae2f4d5c1b0e9d8dd6e1c':
Make string literal concatenation play nice with C++11.
Dan Albert [Tue, 9 Sep 2014 05:15:20 +0000 (22:15 -0700)]
resolved conflicts for merge of
86aeb9ef to lmp-dev-plus-aosp
Change-Id: I82fe2b385156d9bdb9e7183e308d7b2a4167b6ce
Dan Albert [Tue, 9 Sep 2014 04:02:10 +0000 (04:02 +0000)]
Merge "Make string literal concatenation play nice with C++11."
Dan Albert [Tue, 9 Sep 2014 01:53:39 +0000 (18:53 -0700)]
Make string literal concatenation play nice with C++11.
In C++11 mode, "foo"MACRO_THAT_EXPANDS_TO_STRING gets lexed as a user
defined literal. Add space around the macro.
Change-Id: I2741f5be9c0b1562e0f413d1309ef9d687e89b41
Michael Wright [Mon, 8 Sep 2014 23:54:18 +0000 (23:54 +0000)]
am
0b12929f: am
7eff26a0: Merge "Add FEATURE_GAMEPAD." into lmp-dev
* commit '
0b12929fddd9a4b3c9a857ea360213ffd6e60ef2':
Add FEATURE_GAMEPAD.
Michael Wright [Mon, 8 Sep 2014 23:47:00 +0000 (23:47 +0000)]
am
7eff26a0: Merge "Add FEATURE_GAMEPAD." into lmp-dev
* commit '
7eff26a02aeb35d6c48e1af8d9bebcc838ad1fd2':
Add FEATURE_GAMEPAD.
Michael Wright [Mon, 8 Sep 2014 23:21:34 +0000 (23:21 +0000)]
Merge "Add FEATURE_GAMEPAD." into lmp-dev
Nick Kralevich [Mon, 8 Sep 2014 21:05:31 +0000 (21:05 +0000)]
am
2a8bb978: am
51eec3b9: Merge "Fix relabeling of secondary user package directories."
* commit '
2a8bb978d506162a2cff801f24659207790cffd3':
Fix relabeling of secondary user package directories.
Nick Kralevich [Mon, 8 Sep 2014 20:55:32 +0000 (20:55 +0000)]
am
51eec3b9: Merge "Fix relabeling of secondary user package directories."
* commit '
51eec3b98788039afc5fd7ffe76612c7f8d9b39c':
Fix relabeling of secondary user package directories.
Nick Kralevich [Mon, 8 Sep 2014 20:37:23 +0000 (20:37 +0000)]
Merge "Fix relabeling of secondary user package directories."
Stephen Smalley [Mon, 8 Sep 2014 19:51:55 +0000 (15:51 -0400)]
Fix relabeling of secondary user package directories.
When relabeling secondary user package directories, we need to use
the uid of the directory rather than the primary package UID;
otherwise, levelFrom=user will not work correctly.
Change-Id: I0d76ec6ec6fe56a566023ca5e1398efdf28fc81e
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Glenn Kasten [Mon, 8 Sep 2014 17:04:24 +0000 (17:04 +0000)]
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
Glenn Kasten [Mon, 8 Sep 2014 16:56:57 +0000 (16:56 +0000)]
am
d44fea68: Merge "Make IPowerManager native conform to .aidl for oneway" into lmp-dev
* commit '
d44fea6896a54878d2ed5c9284bb3c4738fc6c54':
Make IPowerManager native conform to .aidl for oneway
Glenn Kasten [Mon, 8 Sep 2014 16:33:54 +0000 (16:33 +0000)]
Merge "Make IPowerManager native conform to .aidl for oneway" into lmp-dev
Unsuk Jung [Sun, 7 Sep 2014 09:39:40 +0000 (09:39 +0000)]
am
323ccf6f: am
0fef0629: Add feature android.hardware.audio.output xml file
* commit '
323ccf6f961a66f2503958e72ff8279df5e300e4':
Add feature android.hardware.audio.output xml file
Unsuk Jung [Sun, 7 Sep 2014 09:25:30 +0000 (09:25 +0000)]
am
0fef0629: Add feature android.hardware.audio.output xml file
* commit '
0fef06294c1e4f0ebb6ac15ec228e96d1afe1d61':
Add feature android.hardware.audio.output xml file
Unsuk Jung [Wed, 3 Sep 2014 01:46:59 +0000 (18:46 -0700)]
Add feature android.hardware.audio.output xml file
Bug:
15318046
Change-Id: I49f0881752493ac0bad238b43ce7e1e147119528
Jesse Hall [Sat, 6 Sep 2014 20:14:47 +0000 (20:14 +0000)]
Merge "surfaceflinger: fix -Wunused-parameter warning"
Jesse Hall [Sat, 6 Sep 2014 20:14:41 +0000 (20:14 +0000)]
Merge "surfaceflinger: fix -Wsign-compare warnings"
Jesse Hall [Sat, 6 Sep 2014 20:14:34 +0000 (20:14 +0000)]
Merge "surfaceflinger: fix -Woverloaded-virtual warning"
Jesse Hall [Sat, 6 Sep 2014 20:14:27 +0000 (20:14 +0000)]
Merge "surfaceflinger: fix -Wmismatched-tags warnings"
Jesse Hall [Sat, 6 Sep 2014 20:14:19 +0000 (20:14 +0000)]
Merge "GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT"
Michael Wright [Fri, 5 Sep 2014 22:21:32 +0000 (15:21 -0700)]
Add FEATURE_GAMEPAD.
This allows micro-consoles or other devices to signify that there's a
game controller in the box, even if the user hasn't connected it.
Change-Id: I93cfba8bd1376aa5d1ec772a5b643b974eaa36c5
Glenn Kasten [Fri, 5 Sep 2014 23:46:46 +0000 (16:46 -0700)]
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
Aravind Akella [Fri, 5 Sep 2014 21:33:33 +0000 (21:33 +0000)]
am
71ec4a81: am
253c4720: Merge "SensorService flush fixes." into lmp-dev
* commit '
71ec4a8179a3f24de04e9a6ac824d896f1835170':
SensorService flush fixes.
Aravind Akella [Fri, 5 Sep 2014 20:21:54 +0000 (20:21 +0000)]
am
253c4720: Merge "SensorService flush fixes." into lmp-dev
* commit '
253c4720af3ac631ba04eb379aea91ecc3175cd3':
SensorService flush fixes.
Aravind Akella [Fri, 5 Sep 2014 19:53:36 +0000 (19:53 +0000)]
Merge "SensorService flush fixes." into lmp-dev
Eric Laurent [Fri, 5 Sep 2014 18:04:49 +0000 (18:04 +0000)]
am
2c1eae25: am
437353a0: Merge "IPowerManager: make all binder call one way" into lmp-dev
* commit '
2c1eae259c90d5cfcb7715655f3afd59b7bea9ac':
IPowerManager: make all binder call one way
Eric Laurent [Fri, 5 Sep 2014 17:53:26 +0000 (17:53 +0000)]
am
437353a0: Merge "IPowerManager: make all binder call one way" into lmp-dev
* commit '
437353a0ef596a59ead2dbbe419c249f1e1819e2':
IPowerManager: make all binder call one way
Eric Laurent [Fri, 5 Sep 2014 17:30:04 +0000 (17:30 +0000)]
Merge "IPowerManager: make all binder call one way" into lmp-dev
Jesse Hall [Fri, 8 Aug 2014 05:48:06 +0000 (22:48 -0700)]
surfaceflinger: fix -Wunused-parameter warning
warning: unused parameter 'mustRecompose' [-Wunused-parameter]
Change-Id: I6b8c671189639d851bfa5548742de988d6fa2687
Jesse Hall [Fri, 8 Aug 2014 05:43:06 +0000 (22:43 -0700)]
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
Eric Laurent [Sun, 10 Aug 2014 17:46:52 +0000 (10:46 -0700)]
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
Vinod Krishnan [Thu, 4 Sep 2014 23:57:21 +0000 (23:57 +0000)]
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
Vinod Krishnan [Thu, 4 Sep 2014 23:49:37 +0000 (23:49 +0000)]
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
Vinod Krishnan [Thu, 4 Sep 2014 23:23:46 +0000 (23:23 +0000)]
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
Vinod Krishnan [Thu, 4 Sep 2014 23:11:58 +0000 (23:11 +0000)]
am
8c967b9b: DO NOT MERGE: Removing android prefix for ECG feature
* commit '
8c967b9bea7c80a8bd7d085fa9c9e390495dd1e8':
DO NOT MERGE: Removing android prefix for ECG feature
Vinod Krishnan [Thu, 4 Sep 2014 22:24:12 +0000 (15:24 -0700)]
DO NOT MERGE: Removing android prefix for ECG feature
Bug:
17272904
Change-Id: Ia476bd8853e098600b681bb769536774596b9345
Stephen Hines [Thu, 4 Sep 2014 22:23:18 +0000 (22:23 +0000)]
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).
Michael Wright [Thu, 4 Sep 2014 22:23:17 +0000 (22:23 +0000)]
am
41943dd0: am
9e24c319: Merge "Fix type for temp variable" into lmp-dev
* commit '
41943dd027740873180bea8d30b65d71f0077654':
Fix type for temp variable
Stephen Hines [Thu, 4 Sep 2014 22:09:07 +0000 (22:09 +0000)]
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).
Michael Wright [Thu, 4 Sep 2014 22:09:07 +0000 (22:09 +0000)]
am
9e24c319: Merge "Fix type for temp variable" into lmp-dev
* commit '
9e24c319c3c8395b6dbd57d4cc8e0c749bbbb82c':
Fix type for temp variable
Stephen Hines [Thu, 4 Sep 2014 21:50:39 +0000 (21:50 +0000)]
Merge "Fix undefined behavior (not returning a value from a function with return)." into lmp-dev
Michael Wright [Thu, 4 Sep 2014 21:46:59 +0000 (21:46 +0000)]
Merge "Fix type for temp variable" into lmp-dev
Jesse Hall [Fri, 8 Aug 2014 05:33:14 +0000 (22:33 -0700)]
surfaceflinger: fix -Woverloaded-virtual warning
warning: 'android::LayerDim::isOpaque' hides overloaded virtual function
[-Woverloaded-virtual]
Change-Id: Ie27a6c943f485bc89ce11e424a4e7d99805d4dd0
Jesse Hall [Fri, 8 Aug 2014 05:19:07 +0000 (22:19 -0700)]
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
Jesse Hall [Wed, 6 Aug 2014 19:15:15 +0000 (12:15 -0700)]
GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT
Change-Id: I4dcb57a0db9ee3c5222cd453c9213859384212b0
Stephen Hines [Thu, 4 Sep 2014 15:28:54 +0000 (08:28 -0700)]
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
Aravind Akella [Wed, 3 Sep 2014 22:48:05 +0000 (15:48 -0700)]
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
David Smith [Wed, 3 Sep 2014 23:18:04 +0000 (23:18 +0000)]
Merge "Add RGBA8888 to OMX_COLOR_FORMATTYPE"
David Smith [Fri, 29 Aug 2014 18:06:24 +0000 (11:06 -0700)]
Add RGBA8888 to OMX_COLOR_FORMATTYPE
Change-Id: Ie3d2c7012e48b694f438c90e6a06949076c4b559
Hans Boehm [Wed, 3 Sep 2014 19:23:55 +0000 (19:23 +0000)]
am
2db0e2b1: am
98e56d92: Merge "Fix CAS argument type." into lmp-dev
* commit '
2db0e2b161a22542047d87527a75f9f80e90f465':
Fix CAS argument type.
Wally Yau [Wed, 3 Sep 2014 19:23:54 +0000 (19:23 +0000)]
am
3aa066e9: am
19f8b79f: Merge "New keycode definitions for TV remotes." into lmp-dev
* commit '
3aa066e9d7480f0be806ac2d9f92bbb22771477b':
New keycode definitions for TV remotes.
Hans Boehm [Wed, 3 Sep 2014 17:37:03 +0000 (17:37 +0000)]
am
98e56d92: Merge "Fix CAS argument type." into lmp-dev
* commit '
98e56d926bce70a0a3257c573a92944c8057b528':
Fix CAS argument type.
Wally Yau [Wed, 3 Sep 2014 17:37:02 +0000 (17:37 +0000)]
am
19f8b79f: Merge "New keycode definitions for TV remotes." into lmp-dev
* commit '
19f8b79f154b64c664e974f7be067d456c3d57e2':
New keycode definitions for TV remotes.
Hans Boehm [Wed, 3 Sep 2014 17:18:44 +0000 (17:18 +0000)]
Merge "Fix CAS argument type." into lmp-dev
Wally Yau [Wed, 3 Sep 2014 17:15:37 +0000 (17:15 +0000)]
Merge "New keycode definitions for TV remotes." into lmp-dev
Hans Boehm [Wed, 3 Sep 2014 13:49:01 +0000 (13:49 +0000)]
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.""""
Hans Boehm [Tue, 19 Aug 2014 20:42:54 +0000 (13:42 -0700)]
Fix CAS argument type.
Gcc apparently doesn't check; clang does.
Bug:
17067219
Change-Id: I184084a5063131dbc857c63f97e70e78a05e1a76
(cherry picked from commit
1ddaadb59883df5ca821b4b08fdd41a1720a3b6f)
Hans Boehm [Wed, 3 Sep 2014 06:08:28 +0000 (23:08 -0700)]
resolved conflicts for merge of
08ff8021 to lmp-dev-plus-aosp
Change-Id: I7b57ce5e7d32f6ba4372d7b4af590cc74fd2c7e8
Hans Boehm [Tue, 12 Aug 2014 22:56:00 +0000 (22:56 +0000)]
Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""
After fixing b/
16874785.
This reverts commit
f010a05c7e9a23b6083294aff4a8183ab01f686e.
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
3effababf2980d029339522fdc914bdeb913d99b)
ASAZU, Hideki [Wed, 27 Aug 2014 09:06:31 +0000 (18:06 +0900)]
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
Michael Wright [Tue, 2 Sep 2014 07:09:26 +0000 (07:09 +0000)]
am
883fccb5: am
bcbf97ef: Add logging for switch state
* commit '
883fccb5f89c005502af27a18322f9fa302ac1b3':
Add logging for switch state
Michael Wright [Fri, 29 Aug 2014 23:52:43 +0000 (23:52 +0000)]
am
bcbf97ef: Add logging for switch state
* commit '
bcbf97ef8fb6eaf527014ed9e7d979ad4fe9fdd2':
Add logging for switch state
Michael Wright [Fri, 29 Aug 2014 23:16:26 +0000 (16:16 -0700)]
Fix type for temp variable
Change-Id: I8e2d229da326e5182692f94660336169fb249da7
Michael Wright [Fri, 29 Aug 2014 21:31:32 +0000 (14:31 -0700)]
Add logging for switch state
Bug:
17004602
Change-Id: I15c9feb7b28274183742936c20e34e7fb07e0b70
Alex Light [Fri, 29 Aug 2014 19:12:59 +0000 (19:12 +0000)]
am
e6b643da: am
8b17ac6b: Remove obsolete prunedexcache
* commit '
e6b643da8170a39e4810866e6a9f5c9c9cc767e2':
Remove obsolete prunedexcache
Alex Light [Fri, 29 Aug 2014 18:47:40 +0000 (18:47 +0000)]
am
8b17ac6b: Remove obsolete prunedexcache
* commit '
8b17ac6bd6b5114babac619cad3ff03fbf10a953':
Remove obsolete prunedexcache
Brian Carlstrom [Fri, 29 Aug 2014 11:56:56 +0000 (11:56 +0000)]
am
ad2a4083: am
8c1642ad: Merge "Remove obsolete prunedexcache"
* commit '
ad2a4083fe4010c282999a2c3a8795665ae6a5e9':
Remove obsolete prunedexcache
Brian Carlstrom [Fri, 29 Aug 2014 11:39:54 +0000 (11:39 +0000)]
am
8c1642ad: Merge "Remove obsolete prunedexcache"
* commit '
8c1642ad4ea8fbeb7d03f30e5f50e03c28d40065':
Remove obsolete prunedexcache
Alex Light [Thu, 28 Aug 2014 23:17:04 +0000 (16:17 -0700)]
Remove obsolete prunedexcache
Bug:
16875245
(cherry picked from commit
5f727f86942a188354c028356f1167794fdc8655)
Change-Id: I06e14c405aa4af295795982c1d236be3cb00e893
Brian Carlstrom [Thu, 28 Aug 2014 23:45:11 +0000 (23:45 +0000)]
Merge "Remove obsolete prunedexcache"
Alex Light [Thu, 28 Aug 2014 23:17:04 +0000 (16:17 -0700)]
Remove obsolete prunedexcache
Bug:
16875245
Change-Id: I06e14c405aa4af295795982c1d236be3cb00e893
Jae Seo [Thu, 28 Aug 2014 23:18:35 +0000 (23:18 +0000)]
am
93b1369e: am
a01730f6: Add android.software.live_tv feature
* commit '
93b1369e5d1d71749165aeba31d987f2c9ef6729':
Add android.software.live_tv feature
Jae Seo [Thu, 28 Aug 2014 23:02:14 +0000 (23:02 +0000)]
am
a01730f6: Add android.software.live_tv feature
* commit '
a01730f65b0e9b29c29772b7d83101fbd8f1ad75':
Add android.software.live_tv feature
Jae Seo [Thu, 28 Aug 2014 19:53:46 +0000 (12:53 -0700)]
Add android.software.live_tv feature
Bug:
17284986
Change-Id: I777d045f61a50f7ea473cb26bb509123c440587a
Eric Penner [Wed, 27 Aug 2014 18:35:43 +0000 (18:35 +0000)]
am
57782cd2: am
5c4a1566: Merge "GLConsumer: Fix eglTerminate/eglInit edge case." into lmp-dev
* commit '
57782cd25539aa163b885cd336144d4c8bc9f665':
GLConsumer: Fix eglTerminate/eglInit edge case.
Jeff Sharkey [Wed, 27 Aug 2014 18:35:42 +0000 (18:35 +0000)]
am
18a9457e: am
7903c6a2: Merge "Make clear data stricter." into lmp-dev
* commit '
18a9457edde6163539338e05a31c3431bc747c5f':
Make clear data stricter.
Eric Penner [Wed, 27 Aug 2014 18:26:20 +0000 (18:26 +0000)]
am
5c4a1566: Merge "GLConsumer: Fix eglTerminate/eglInit edge case." into lmp-dev
* commit '
5c4a15665968471ddbac0b476514d00503e997c7':
GLConsumer: Fix eglTerminate/eglInit edge case.
Jeff Sharkey [Wed, 27 Aug 2014 18:26:20 +0000 (18:26 +0000)]
am
7903c6a2: Merge "Make clear data stricter." into lmp-dev
* commit '
7903c6a263354506ace10fc32aa65c231b64f62b':
Make clear data stricter.
Eric Penner [Wed, 27 Aug 2014 18:07:04 +0000 (18:07 +0000)]
Merge "GLConsumer: Fix eglTerminate/eglInit edge case." into lmp-dev
Jeff Sharkey [Wed, 27 Aug 2014 17:58:34 +0000 (17:58 +0000)]
Merge "Make clear data stricter." into lmp-dev
Jeff Sharkey [Wed, 27 Aug 2014 17:46:25 +0000 (10:46 -0700)]
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
Calin Juravle [Wed, 27 Aug 2014 17:06:32 +0000 (17:06 +0000)]
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.
Calin Juravle [Wed, 27 Aug 2014 17:06:18 +0000 (17:06 +0000)]
am
8694bc36: am
f6e1611a: (-s ours) Merge "Add vm_safe_mode to dexopt."
* commit '
8694bc366f93a76c52f1c71dfc1d9f9fb896bcac':
Add vm_safe_mode to dexopt.
Calin Juravle [Wed, 27 Aug 2014 16:33:27 +0000 (16:33 +0000)]
am
97477d20: Set compiler filter flag to true when vmSafeMode is present.
* commit '
97477d203eaf0c3235bbe2415356f20a0431cada':
Set compiler filter flag to true when vmSafeMode is present.
Calin Juravle [Wed, 27 Aug 2014 16:07:25 +0000 (16:07 +0000)]
am
f6e1611a: (-s ours) Merge "Add vm_safe_mode to dexopt."
* commit '
f6e1611a8d7990779152539e866bf8524527469f':
Add vm_safe_mode to dexopt.
Calin Juravle [Wed, 27 Aug 2014 15:50:16 +0000 (15:50 +0000)]
Merge "Add vm_safe_mode to dexopt."
Calin Juravle [Thu, 21 Aug 2014 18:05:20 +0000 (19:05 +0100)]
Add vm_safe_mode to dexopt.
The flag enforces interpret-only flag for dex2oat.
Bug:
12457423
(cherry picked from commit
b1efac103523efccbe671e76cc0eaaeab810415b)
(cherry picked from commit
97477d203eaf0c3235bbe2415356f20a0431cada)
Change-Id: I215339527e998b24e274c8df42a5024839e6a9fa
Calin Juravle [Wed, 27 Aug 2014 15:10:03 +0000 (16:10 +0100)]
Set compiler filter flag to true when vmSafeMode is present.
Bug:
12457423
Change-Id: I33345c5cce76681d8a6592ebae8c9f96a9f0f8bd
Eric Penner [Tue, 26 Aug 2014 03:16:37 +0000 (20:16 -0700)]
GLConsumer: Fix eglTerminate/eglInit edge case.
If a display is terminated and then initialized, we can't detect
this using the display itself (it has the same value), but all
EglImages still become invalid for the display. This patch detects
this during image binding and forces creation of a new EglImage.
Bug:
10430249
Change-Id: I75101c50962f21263dca3ec6e241a2e5a3c23dad
Calin Juravle [Tue, 26 Aug 2014 19:34:45 +0000 (19:34 +0000)]
am
2d509c01: am
7de2bde3: Merge "Add vm_safe_mode to dexopt." into lmp-dev
* commit '
2d509c01132cfa745b3fb2e40e67805cd0bc7f22':
Add vm_safe_mode to dexopt.
Calin Juravle [Tue, 26 Aug 2014 19:28:57 +0000 (19:28 +0000)]
am
7de2bde3: Merge "Add vm_safe_mode to dexopt." into lmp-dev
* commit '
7de2bde3c4c3a6ecc7e6f21e3f3322688b718c4a':
Add vm_safe_mode to dexopt.
Calin Juravle [Tue, 26 Aug 2014 19:09:55 +0000 (19:09 +0000)]
Merge "Add vm_safe_mode to dexopt." into lmp-dev
Calin Juravle [Tue, 26 Aug 2014 18:18:51 +0000 (18:18 +0000)]
am
d3b6802c: am
c70626a1: Merge "Pass isa features flag to dex2oat."
* commit '
d3b6802cb7065cc46896869879cc414ffe98610c':
Pass isa features flag to dex2oat.
Calin Juravle [Tue, 26 Aug 2014 18:08:48 +0000 (18:08 +0000)]
am
c70626a1: Merge "Pass isa features flag to dex2oat."
* commit '
c70626a1ef18ef316a633ba0e399dbdf8f85973a':
Pass isa features flag to dex2oat.
Calin Juravle [Tue, 26 Aug 2014 18:04:17 +0000 (18:04 +0000)]
am
188fb813: am
20558f11: Merge "Pass isa features flag to dex2oat." into lmp-dev
* commit '
188fb813c1f1d4bb7edc81c7be8d287d3456d301':
Pass isa features flag to dex2oat.
Calin Juravle [Tue, 26 Aug 2014 17:52:26 +0000 (17:52 +0000)]
Merge "Pass isa features flag to dex2oat."
Calin Juravle [Tue, 26 Aug 2014 17:51:57 +0000 (17:51 +0000)]
am
20558f11: Merge "Pass isa features flag to dex2oat." into lmp-dev
* commit '
20558f1154abcf3360fd972f6d2c80bb80f78502':
Pass isa features flag to dex2oat.
Calin Juravle [Tue, 19 Aug 2014 17:48:50 +0000 (18:48 +0100)]
Pass isa features flag to dex2oat.
Bug:
16716262
(cherry picked from commit
8fc7315a67fdbf9b56cc6fa061f0773be2223a81)
Change-Id: I3cb1d82604612bc7212bcbdeef685bc05b695b6a