Commit Graph

50886 Commits

Author SHA1 Message Date
Jeff Sharkey
0ffb91383f am 464e539c: Merge "Add new system APK locations." into lmp-dev
* commit '464e539cd3e931aaca99a67d0addc6d68bd96b3d':
  Add new system APK locations.
2014-09-09 16:44:52 +00:00
Jeff Sharkey
464e539cd3 Merge "Add new system APK locations." into lmp-dev 2014-09-09 16:27:06 +00:00
Dan Albert
7d83187103 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.

Had missed these when resolving merge conflicts last night.

Change-Id: I1a381a06c3909b76a3b44ce79c37aa6f244d3736
2014-09-09 09:21:28 -07:00
Jeff Sharkey
770180a4dd Add new system APK locations.
Add /system/priv-app and /oem/app paths to system paths.  Also allow
rmdex on system apps, and quietly ignore when it was already removed.

Also relax logging when clearing code cache, since it's optional.

Bug: 17205122
Change-Id: I4fc4d0f63a3596937c4defbd64e1f8a1c563f02d
2014-09-09 08:22:58 -07:00
Dan Albert
5273a97833 resolved conflicts for merge of 86aeb9ef to lmp-dev-plus-aosp
Change-Id: I82fe2b385156d9bdb9e7183e308d7b2a4167b6ce
2014-09-08 22:15:20 -07:00
Dan Albert
86aeb9ef15 Merge "Make string literal concatenation play nice with C++11." 2014-09-09 04:02:10 +00:00
Dan Albert
8b49125f10 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
2014-09-08 18:53:39 -07:00
Michael Wright
0b12929fdd am 7eff26a0: Merge "Add FEATURE_GAMEPAD." into lmp-dev
* commit '7eff26a02aeb35d6c48e1af8d9bebcc838ad1fd2':
  Add FEATURE_GAMEPAD.
2014-09-08 23:47:00 +00:00
Michael Wright
7eff26a02a Merge "Add FEATURE_GAMEPAD." into lmp-dev 2014-09-08 23:21:35 +00:00
Nick Kralevich
2a8bb978d5 am 51eec3b9: Merge "Fix relabeling of secondary user package directories."
* commit '51eec3b98788039afc5fd7ffe76612c7f8d9b39c':
  Fix relabeling of secondary user package directories.
2014-09-08 20:55:32 +00:00
Nick Kralevich
51eec3b987 Merge "Fix relabeling of secondary user package directories." 2014-09-08 20:37:23 +00:00
Stephen Smalley
8ac2a648b6 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>
2014-09-08 15:51:55 -04: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
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
Michael Wright
581ec20bcf 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
2014-09-05 17:59:01 -07: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
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
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
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
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
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
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
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
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
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
e6b643da81 am 8b17ac6b: Remove obsolete prunedexcache
* commit '8b17ac6bd6b5114babac619cad3ff03fbf10a953':
  Remove obsolete prunedexcache
2014-08-29 18:47:40 +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
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