OSDN Git Service
Dan Austin [Wed, 23 Sep 2015 17:25:01 +0000 (17:25 +0000)]
am
476398ab: am
0830bb16: Merge "Enable integer overflow sanitization in libinput."
* commit '
476398ab60f4f777b0d7c85986f0185350468d5d':
Enable integer overflow sanitization in libinput.
Dan Austin [Wed, 23 Sep 2015 17:25:00 +0000 (17:25 +0000)]
am
0ba3db9e: am
bffbd09f: Merge "Eliminate multiple benign overflow conditions."
* commit '
0ba3db9e91d683a75af244cccfa62c8778a4c62a':
Eliminate multiple benign overflow conditions.
Sergio Giro [Wed, 23 Sep 2015 17:24:58 +0000 (17:24 +0000)]
am
f1519eeb: am
64b83133: Merge "Remove usage of SharedBuffer"
* commit '
f1519eeb21ee03a956d973545f9f0f742727faaa':
Remove usage of SharedBuffer
Dan Austin [Wed, 23 Sep 2015 17:14:55 +0000 (17:14 +0000)]
am
0830bb16: Merge "Enable integer overflow sanitization in libinput."
* commit '
0830bb169717f920817e66afb18abe2c86d20161':
Enable integer overflow sanitization in libinput.
Dan Austin [Wed, 23 Sep 2015 17:14:53 +0000 (17:14 +0000)]
am
bffbd09f: Merge "Eliminate multiple benign overflow conditions."
* commit '
bffbd09f65d3bc594d844a185d75700e8b4789eb':
Eliminate multiple benign overflow conditions.
Sergio Giro [Wed, 23 Sep 2015 17:14:38 +0000 (17:14 +0000)]
am
64b83133: Merge "Remove usage of SharedBuffer"
* commit '
64b83133d5ec40828a10e57cfbb37c642bb7f510':
Remove usage of SharedBuffer
Michael Wright [Wed, 23 Sep 2015 16:53:27 +0000 (16:53 +0000)]
am
bc16fb98: am
cff01363: Merge commit \'
8a196b5630a93a3eb6df4cbe461917731e54fb35\' into merge-fix
* commit '
bc16fb988748f8870ff20afaf806f503ca960a6d':
DO NOT MERGE Revert "am
f37143d8: Merge "Cancel touches as well as pointer gestures." into mnc-dev"
Dan Austin [Wed, 23 Sep 2015 16:47:59 +0000 (16:47 +0000)]
Merge "Enable integer overflow sanitization in libinput."
Michael Wright [Wed, 23 Sep 2015 16:44:23 +0000 (16:44 +0000)]
am
cff01363: Merge commit \'
8a196b5630a93a3eb6df4cbe461917731e54fb35\' into merge-fix
* commit '
cff01363fcbdae5486287540e1f8917244aaea90':
DO NOT MERGE Revert "am
f37143d8: Merge "Cancel touches as well as pointer gestures." into mnc-dev"
Dan Austin [Tue, 22 Sep 2015 21:33:57 +0000 (14:33 -0700)]
Enable integer overflow sanitization in libinput.
Bug:
24171356
Change-Id: I1412b78171c60b0252560956a672f2d92a7011e6
Michael Wright [Wed, 23 Sep 2015 16:36:41 +0000 (17:36 +0100)]
Merge commit '
8a196b5630a93a3eb6df4cbe461917731e54fb35' into merge-fix
Change-Id: Iae99c0f3a13d999f1ff093993008a7c720e99725
Dan Austin [Wed, 23 Sep 2015 16:36:28 +0000 (16:36 +0000)]
Merge "Eliminate multiple benign overflow conditions."
Sergio Giro [Wed, 23 Sep 2015 16:22:55 +0000 (16:22 +0000)]
Merge "Remove usage of SharedBuffer"
Dan Austin [Wed, 23 Sep 2015 14:58:25 +0000 (14:58 +0000)]
am
c6a6c6de: am
ad2a1592: Merge "Enable multiple benign overflow conditions."
* commit '
c6a6c6de7c43198dc93f92f935ebc120de1050c8':
Enable multiple benign overflow conditions.
Dan Austin [Wed, 23 Sep 2015 14:58:24 +0000 (14:58 +0000)]
am
fc6a2bff: am
146f31b6: Merge "Eliminate benign overflow condition triggered upon loop termination in Input.cpp"
* commit '
fc6a2bff11e342acb3c098bc2be7557e0876efac':
Eliminate benign overflow condition triggered upon loop termination in Input.cpp
Dan Austin [Wed, 23 Sep 2015 14:52:27 +0000 (14:52 +0000)]
am
ad2a1592: Merge "Enable multiple benign overflow conditions."
* commit '
ad2a1592cf01a5393ad645fea81b6c36ee11f73e':
Enable multiple benign overflow conditions.
Dan Austin [Wed, 23 Sep 2015 14:52:26 +0000 (14:52 +0000)]
am
146f31b6: Merge "Eliminate benign overflow condition triggered upon loop termination in Input.cpp"
* commit '
146f31b6c44f557270779106e95c769783270fed':
Eliminate benign overflow condition triggered upon loop termination in Input.cpp
Dan Austin [Wed, 23 Sep 2015 14:45:51 +0000 (14:45 +0000)]
Merge "Enable multiple benign overflow conditions."
Dan Austin [Wed, 23 Sep 2015 14:45:25 +0000 (14:45 +0000)]
Merge "Eliminate benign overflow condition triggered upon loop termination in Input.cpp"
Michael Wright [Wed, 23 Sep 2015 13:15:33 +0000 (13:15 +0000)]
Merge "DO NOT MERGE Revert "am
f37143d8: Merge "Cancel touches as well as pointer gestures." into mnc-dev"" into mnc-dr-dev
Dan Austin [Tue, 22 Sep 2015 21:28:07 +0000 (14:28 -0700)]
Eliminate multiple benign overflow conditions.
In InputTransport.cpp, there are multiple loops in which loop
termination occurs when the value becomes zero. These termination
conditions are all written value-- > 0, which, since value is
unsigned, result in an unsigned integer overflow when value is 0.
These loops were refactored to eliminate these conditions.
Bug:
24171356
Change-Id: Ie135c4306d1f2cef2778e295242305ed5139221a
Dan Austin [Tue, 22 Sep 2015 21:32:03 +0000 (14:32 -0700)]
Enable multiple benign overflow conditions.
In VelocityTracker.cpp, there are multiple loops in which loop
termination occurs when the value becomes zero. These termination
conditions are all written value-- > 0, which, since value is
unsigned, result in an integer overflow condition when value is 0.
These loop were refactored to eliminate these conditions.
Bug:
24171356
Change-Id: Ie44940cfef8a122ee1aff59c021274ba39a368bf
Dan Austin [Tue, 22 Sep 2015 21:22:41 +0000 (14:22 -0700)]
Eliminate benign overflow condition triggered upon loop termination in Input.cpp
In readFromParcel, a while loop is terminated when sampleCount = 0. The
decrement operation that was here would decrease sampleCount, an unsigned value,
below 0, triggering an unsigned integer overflow. The while loop was refactored
to eliminate this condition.
Bug:
24171356
Change-Id: I7669f54a41d11548b33e322b025431c6f6038952
Michael Wright [Tue, 22 Sep 2015 20:04:33 +0000 (21:04 +0100)]
DO NOT MERGE Revert "am
f37143d8: Merge "Cancel touches as well as pointer gestures." into mnc-dev"
This reverts commit
9b70ab7a3cb260205e81e40ba181a86710d2eb95, reversing
changes made to
153008efb5a00ed3c18d588ce15f90d2442a9786.
Bug:
24302031
Change-Id: Ia746381b30be3b54cb646ed412b7271962c4b02a
Andreas Gampe [Tue, 22 Sep 2015 18:58:58 +0000 (18:58 +0000)]
am
6263caf7: am
83af0cc2: am
72ebebed: Installd: Take boot status as dexopt parameter
* commit '
6263caf72f343dfbb18e7061c5453f78cfa19e72':
Installd: Take boot status as dexopt parameter
Andreas Gampe [Tue, 22 Sep 2015 18:50:45 +0000 (18:50 +0000)]
am
83af0cc2: am
72ebebed: Installd: Take boot status as dexopt parameter
* commit '
83af0cc22c77c31df1f08d65f29509b6123b6399':
Installd: Take boot status as dexopt parameter
Andreas Gampe [Tue, 22 Sep 2015 18:36:46 +0000 (18:36 +0000)]
am
72ebebed: Installd: Take boot status as dexopt parameter
* commit '
72ebebed876a62e719b098e43d9d516361bde029':
Installd: Take boot status as dexopt parameter
Nick Kralevich [Mon, 21 Sep 2015 22:32:01 +0000 (22:32 +0000)]
am
96c5d65b: am
251c8b3f: Merge "constify generated JNINativeMethod fn ptr tables"
* commit '
96c5d65b0bef97c1315ea5d7568df912710383c7':
constify generated JNINativeMethod fn ptr tables
Nick Kralevich [Mon, 21 Sep 2015 22:22:23 +0000 (22:22 +0000)]
am
251c8b3f: Merge "constify generated JNINativeMethod fn ptr tables"
* commit '
251c8b3ff842363243c8eea25b369bd805af7aad':
constify generated JNINativeMethod fn ptr tables
Nick Kralevich [Mon, 21 Sep 2015 21:42:06 +0000 (21:42 +0000)]
Merge "constify generated JNINativeMethod fn ptr tables"
Tom Cherry [Mon, 21 Sep 2015 21:27:37 +0000 (14:27 -0700)]
add system-background cpuset
add a new cpuset for system services that should not run on
larger cores
bug
24144797
Change-Id: I4f3cd34711b7ffcd2ef45ef2a3cd4642d0ef34c5
Andreas Gampe [Mon, 21 Sep 2015 20:21:30 +0000 (13:21 -0700)]
Installd: Take boot status as dexopt parameter
Expect the boot status explicitly as a parameter so that we do not
have to rely on dev.bootcomplete, which isn't meaningfully set
when the device needs the decryption screen on boot.
Bug:
23898216
Change-Id: I9b34298caf70b1e5d40970cc0d04c469016a80a7
Daniel Micay [Mon, 21 Sep 2015 17:17:57 +0000 (13:17 -0400)]
constify generated JNINativeMethod fn ptr tables
Change-Id: Icbad34e298f6d8e60ef12e9a91200994249fe2f5
Pablo Ceballos [Fri, 11 Sep 2015 21:37:39 +0000 (14:37 -0700)]
Remove usage of SharedBuffer
- Remove getSharedBuffer() from Region
- Don't use SharedBuffer for memory management in HWCLayerVersion1,
instead keep shallow copies of the Regions.
Bug
23962051
(cherry picked from commit
d814cf2a3e3a2fdb73efa80539fe8af0a93da1db)
Change-Id: I8fa17beed57936648c7b4defc9219dff1d5b337f
Colin Cross [Sat, 19 Sep 2015 19:55:53 +0000 (19:55 +0000)]
am
d1ddf299: resolved conflicts for
5b5c81c4 to stage-aosp-master
* commit '
d1ddf29901aef92e53e420e9937e9a4937569b9d':
asan: update condition to work with multiple SANITIZE_TARGET values.
Evgenii Stepanov [Sat, 19 Sep 2015 19:30:54 +0000 (19:30 +0000)]
am
7944e8ad: With SANITIZE_TARGET, load EGL libs from the instrumented path.
* commit '
7944e8ad6737309d0f64d180a450eaeebfc9865f':
With SANITIZE_TARGET, load EGL libs from the instrumented path.
Colin Cross [Sat, 19 Sep 2015 17:37:05 +0000 (10:37 -0700)]
resolved conflicts for
5b5c81c4 to stage-aosp-master
Change-Id: I0be665105d46cb3b934cb00890822d4dfae18f64
Evgenii Stepanov [Wed, 8 Jul 2015 22:49:52 +0000 (15:49 -0700)]
With SANITIZE_TARGET, load EGL libs from the instrumented path.
Bug:
21785137
Change-Id: Iac56419a9ca776c5704bed44d3f0a1a1edd9d172
(cherry picked from commit
c2466e6f005e9cbeea7764e9d8864fa6bca17633)
Evgenii Stepanov [Fri, 18 Sep 2015 20:23:35 +0000 (20:23 +0000)]
Merge "asan: update condition to work with multiple SANITIZE_TARGET values."
Ivan Krasin [Fri, 18 Sep 2015 19:03:44 +0000 (12:03 -0700)]
asan: update condition to work with multiple SANITIZE_TARGET values.
The goal is to enable SANITIZE_TARGET='address coverage', which
will be used by LLVMFuzzer.
Bug:
22850550
Change-Id: Iaa300aa20798f2e9aa613842b463edf8aeebe3a7
Andreas Gampe [Thu, 17 Sep 2015 22:47:14 +0000 (22:47 +0000)]
am
ebb28d9d: am
c5a6696f: Merge "Installd: Allow different behavior before bootcomplete"
* commit '
ebb28d9d614fb7b25406429c339cd3e0247500f2':
Installd: Allow different behavior before bootcomplete
Andreas Gampe [Thu, 17 Sep 2015 22:40:57 +0000 (22:40 +0000)]
am
c5a6696f: Merge "Installd: Allow different behavior before bootcomplete"
* commit '
c5a6696f3e51e253b78baacdec99ed34e79bc3fd':
Installd: Allow different behavior before bootcomplete
Andreas Gampe [Thu, 17 Sep 2015 22:36:50 +0000 (22:36 +0000)]
Merge "Installd: Allow different behavior before bootcomplete"
Andreas Gampe [Mon, 14 Sep 2015 23:33:11 +0000 (16:33 -0700)]
Installd: Allow different behavior before bootcomplete
Check dev.bootcomplete in dex2oat(). Use the information for
two changes.
Only switch to the background when we're post bootcomplete.
This will ensure better utilization after upgrades.
Add a second dex2oat-threads property that is used pre
bootcomplete. A separation of these phases allows using less
cores when the device is up, freeing up resources for other
purposes, e.g., avoid jank. The precedence during boot is the
boot property, or the image property if the former doesn't
exist, or the default property as a fallback.
Bug:
23898216
Bug:
24004256
(cherry picked from commit
21948005f0294a64a42932b21a33ae75295dc3d9)
Change-Id: I5063f3fc4b437cbe88c4e94584e01c1c78eccc4d
Andreas Gampe [Thu, 17 Sep 2015 02:45:31 +0000 (02:45 +0000)]
am
6f3c7877: am
da5b88ad: am
d693fc4c: Merge "Installd: Allow different behavior before bootcomplete" into mnc-dr-dev
* commit '
6f3c78771f92f269fb9e44c98f821cdc942474e9':
Installd: Allow different behavior before bootcomplete
Andreas Gampe [Thu, 17 Sep 2015 00:00:06 +0000 (00:00 +0000)]
am
da5b88ad: am
d693fc4c: Merge "Installd: Allow different behavior before bootcomplete" into mnc-dr-dev
* commit '
da5b88adac403bbce0669fe9db531897b8be9e7c':
Installd: Allow different behavior before bootcomplete
Andreas Gampe [Wed, 16 Sep 2015 23:51:41 +0000 (23:51 +0000)]
am
d693fc4c: Merge "Installd: Allow different behavior before bootcomplete" into mnc-dr-dev
* commit '
d693fc4c50873485794d1e0f444547d3253a56d3':
Installd: Allow different behavior before bootcomplete
Andreas Gampe [Wed, 16 Sep 2015 23:44:06 +0000 (23:44 +0000)]
Merge "Installd: Allow different behavior before bootcomplete" into mnc-dr-dev
Andreas Gampe [Mon, 14 Sep 2015 23:33:11 +0000 (16:33 -0700)]
Installd: Allow different behavior before bootcomplete
Check dev.bootcomplete in dex2oat(). Use the information for
two changes.
Only switch to the background when we're post bootcomplete.
This will ensure better utilization after upgrades.
Add a second dex2oat-threads property that is used pre
bootcomplete. A separation of these phases allows using less
cores when the device is up, freeing up resources for other
purposes, e.g., avoid jank. The precedence during boot is the
boot property, or the image property if the former doesn't
exist, or the default property as a fallback.
Bug:
23898216
Bug:
24004256
Change-Id: I5063f3fc4b437cbe88c4e94584e01c1c78eccc4d
Daniel Erat [Wed, 16 Sep 2015 03:02:46 +0000 (03:02 +0000)]
am
d46e6e37: am
c0ed1282: Merge "Update libpowermanager to expose enum and export headers."
* commit '
d46e6e37c462029d0167d5d1eeac4fa479140235':
Update libpowermanager to expose enum and export headers.
Daniel Erat [Wed, 16 Sep 2015 02:54:00 +0000 (02:54 +0000)]
am
c0ed1282: Merge "Update libpowermanager to expose enum and export headers."
* commit '
c0ed128263f753696cbcb24a5d1a45bc894ae336':
Update libpowermanager to expose enum and export headers.
Daniel Erat [Wed, 16 Sep 2015 02:45:23 +0000 (02:45 +0000)]
Merge "Update libpowermanager to expose enum and export headers."
Daniel Erat [Tue, 15 Sep 2015 16:50:17 +0000 (10:50 -0600)]
Update libpowermanager to expose enum and export headers.
Move libpowermanager's transaction ID enum (needed when
implementing BnPowerManager::onTransact()) into
IPowerManager.h and update the library's Android.mk file to
export its headers.
Bug:
22122485
Change-Id: Ie97198c3d2ebe8e880125e19a001ef7162009858
Daniel Erat [Tue, 15 Sep 2015 14:34:37 +0000 (14:34 +0000)]
am
d7fb1d2a: am
f2e53c5e: Merge "Remove BnServiceManager."
* commit '
d7fb1d2a5bed8941c8bc21ed50f6a129c2ebef3d':
Remove BnServiceManager.
Daniel Erat [Tue, 15 Sep 2015 14:28:00 +0000 (14:28 +0000)]
am
f2e53c5e: Merge "Remove BnServiceManager."
* commit '
f2e53c5e1f3fd27c9131f20b2f8147c82372f746':
Remove BnServiceManager.
Daniel Erat [Tue, 15 Sep 2015 14:21:30 +0000 (14:21 +0000)]
Merge "Remove BnServiceManager."
Lorenzo Colitti [Tue, 15 Sep 2015 03:02:01 +0000 (03:02 +0000)]
am
a8273f09: am
872269a5: am
6afc38c4: Dump the ND offload status and address table in bugreports.
* commit '
a8273f094437d1e1d3c074e35c325e4512e5c465':
Dump the ND offload status and address table in bugreports.
Lorenzo Colitti [Tue, 15 Sep 2015 02:55:55 +0000 (02:55 +0000)]
am
872269a5: am
6afc38c4: Dump the ND offload status and address table in bugreports.
* commit '
872269a579e776c61ac5777e70ca2981771117d6':
Dump the ND offload status and address table in bugreports.
Lorenzo Colitti [Tue, 15 Sep 2015 02:46:32 +0000 (02:46 +0000)]
am
6afc38c4: Dump the ND offload status and address table in bugreports.
* commit '
6afc38c45af45eb8f64793bca2903b3f4c55579b':
Dump the ND offload status and address table in bugreports.
Daniel Erat [Mon, 14 Sep 2015 22:29:54 +0000 (16:29 -0600)]
Remove BnServiceManager.
As far as I can tell (e.g. https://goo.gl/nxpFBZ from 2009),
BnServiceManager is unused. It's only relevant for
libbinder-based C++ daemons implementing the
IServiceManager.aidl interface. service_manager.c rolls its
own binder code instead.
Change-Id: I837a897d8a201b04bf3ff65c87b0d35d10196199
Dan Austin [Thu, 10 Sep 2015 22:12:56 +0000 (22:12 +0000)]
am
f0f131f3: am
6c8c8138: Merge "Benign unsigned integer overflow in Parcel"
* commit '
f0f131f36b5ce2a25992576aa75e7c08654e5a8d':
Benign unsigned integer overflow in Parcel
Dan Austin [Thu, 10 Sep 2015 22:12:55 +0000 (22:12 +0000)]
am
6d59e98b: am
8c77ec50: Merge "Enable fsanitize integer in ui"
* commit '
6d59e98bb19d2d63fc3b3761e51fda2948976c03':
Enable fsanitize integer in ui
Dan Austin [Thu, 10 Sep 2015 22:06:23 +0000 (22:06 +0000)]
am
6c8c8138: Merge "Benign unsigned integer overflow in Parcel"
* commit '
6c8c8138434d2381a78407e9876121d3bcef55a7':
Benign unsigned integer overflow in Parcel
Dan Austin [Thu, 10 Sep 2015 22:06:23 +0000 (22:06 +0000)]
am
8c77ec50: Merge "Enable fsanitize integer in ui"
* commit '
8c77ec506a83538d85cf68b8095541ca8aa8c788':
Enable fsanitize integer in ui
Dan Austin [Thu, 10 Sep 2015 22:02:03 +0000 (22:02 +0000)]
Merge "Benign unsigned integer overflow in Parcel"
Dan Austin [Thu, 10 Sep 2015 21:58:27 +0000 (21:58 +0000)]
Merge "Enable fsanitize integer in ui"
Dan Austin [Thu, 10 Sep 2015 20:46:02 +0000 (13:46 -0700)]
Benign unsigned integer overflow in Parcel
The realloc case in continueWrite did not update the
gParcelGlobalAllocCount value when an allocation occurred.
In addition, there are conditions that could cause the
gParcelGlobalAllocCount value to be decremented below 0, resulting
in a benign unsigned integer overflow that can cause corrupted values
to be returned through system profiling mechanisms.
BUG:
23972600
Change-Id: Ibe07db91a811a04b486760eb78d81c926ba8503d
Dan Austin [Wed, 9 Sep 2015 14:58:05 +0000 (14:58 +0000)]
am
8e2a4f27: am
bf04509f: Merge "Enable fsanitize integer in binder"
* commit '
8e2a4f2723ee1d3fb7187af7078256c6a94f8930':
Enable fsanitize integer in binder
Dan Austin [Wed, 9 Sep 2015 14:48:19 +0000 (14:48 +0000)]
am
bf04509f: Merge "Enable fsanitize integer in binder"
* commit '
bf04509ff42fc1e179b518caada5d0b663f2a8ee':
Enable fsanitize integer in binder
Dan Austin [Wed, 9 Sep 2015 14:39:25 +0000 (14:39 +0000)]
Merge "Enable fsanitize integer in binder"
Dan Austin [Tue, 8 Sep 2015 23:18:13 +0000 (16:18 -0700)]
Enable fsanitize integer in binder
Enables checks for undefined or suspicious integer behavior. If
suspicious behavior is detected, the process is aborted instead of
potentially resulting in a security bug, such as #
20674694 and
#
19573085.
Bug:
23836686
Change-Id: I14d6d565afcb8a6435fd5a8e8175e00bbe5d9b6c
Lorenzo Colitti [Wed, 9 Sep 2015 13:59:25 +0000 (22:59 +0900)]
Dump the ND offload status and address table in bugreports.
Also, move NetworkDiagnostics between the two runs of getting the
wifi counters, so we can see the effect on the counters of
sending our probe packets.
Bug:
23661687
Change-Id: I3f81c003a35f50ac1cb8e77d0a8c73dae4fd91f3
Dan Austin [Tue, 8 Sep 2015 21:53:00 +0000 (14:53 -0700)]
Enable fsanitize integer in ui
Enables checks for undefined or suspicious integer behavior. If
suspicious behavior is detected, the process is aborted instead of
potentially resulting in a security bug.
Bug:
23834892
Change-Id: I9111bce2ebb36e045f4da1dbf78f90f04a0aa81c
Martijn Coenen [Mon, 7 Sep 2015 07:46:39 +0000 (07:46 +0000)]
am
c2874048: am
5ca0c2ed: am
624408ee: Merge "Map realtime to clock_monotonic." into mnc-dr-dev
* commit '
c2874048d0bbc6739b083bd84c7476a7fa6550e3':
Map realtime to clock_monotonic.
Martijn Coenen [Mon, 7 Sep 2015 07:38:29 +0000 (07:38 +0000)]
am
5ca0c2ed: am
624408ee: Merge "Map realtime to clock_monotonic." into mnc-dr-dev
* commit '
5ca0c2ede8a8d3f499dd7d27832713d4ce16d4ba':
Map realtime to clock_monotonic.
Martijn Coenen [Mon, 7 Sep 2015 07:30:19 +0000 (07:30 +0000)]
am
624408ee: Merge "Map realtime to clock_monotonic." into mnc-dr-dev
* commit '
624408eecb0d278cb1de1bb088699e25b319d15e':
Map realtime to clock_monotonic.
Martijn Coenen [Mon, 7 Sep 2015 07:25:51 +0000 (07:25 +0000)]
Merge "Map realtime to clock_monotonic." into mnc-dr-dev
Nick Armstrong-Crews [Fri, 4 Sep 2015 18:27:51 +0000 (18:27 +0000)]
am
8d13427f: am
3c8a147c: Merge "Add KEYCODE_SOFT_SLEEP for Ungaze." into cw-e-dev
* commit '
8d13427f6febd7a2abf3946a21dd826d55791f21':
Add KEYCODE_SOFT_SLEEP for Ungaze.
Nick Armstrong-Crews [Fri, 4 Sep 2015 18:16:12 +0000 (18:16 +0000)]
am
3c8a147c: Merge "Add KEYCODE_SOFT_SLEEP for Ungaze." into cw-e-dev
* commit '
3c8a147c8394a32217bb65672387d69a49a31270':
Add KEYCODE_SOFT_SLEEP for Ungaze.
Nick Armstrong-Crews [Fri, 4 Sep 2015 18:04:11 +0000 (18:04 +0000)]
Merge "Add KEYCODE_SOFT_SLEEP for Ungaze." into cw-e-dev
Dan Stoza [Fri, 4 Sep 2015 02:21:32 +0000 (02:21 +0000)]
am
e5ce0db8: am
f090d598: am
3e4c8ccc: Merge "SF: Add colorTransform to DisplayInfo" into mnc-dr-dev
* commit '
e5ce0db83355bd2c8f3d265e3e254c22c6a61cd4':
SF: Add colorTransform to DisplayInfo
Tom Cherry [Thu, 3 Sep 2015 22:28:36 +0000 (22:28 +0000)]
am
5943d9bc: am
477b1e87: Merge "move init.trace.rc to frameworks/native"
* commit '
5943d9bc4751808d165e2c5f0e2c04a99aa077d6':
move init.trace.rc to frameworks/native
Dan Stoza [Thu, 3 Sep 2015 22:13:25 +0000 (22:13 +0000)]
am
f090d598: am
3e4c8ccc: Merge "SF: Add colorTransform to DisplayInfo" into mnc-dr-dev
* commit '
f090d5985a20f13433be632beb45af8a882c0cd0':
SF: Add colorTransform to DisplayInfo
Dan Stoza [Thu, 3 Sep 2015 22:03:03 +0000 (22:03 +0000)]
am
3e4c8ccc: Merge "SF: Add colorTransform to DisplayInfo" into mnc-dr-dev
* commit '
3e4c8ccc3e5d037688ed8a1f8b69764c526e0d2f':
SF: Add colorTransform to DisplayInfo
Tom Cherry [Thu, 3 Sep 2015 22:02:40 +0000 (22:02 +0000)]
am
477b1e87: Merge "move init.trace.rc to frameworks/native"
* commit '
477b1e873a894a4331535bf1a59d76ec0cdd809a':
move init.trace.rc to frameworks/native
Dan Stoza [Thu, 3 Sep 2015 21:55:36 +0000 (21:55 +0000)]
Merge "SF: Add colorTransform to DisplayInfo" into mnc-dr-dev
Tom Cherry [Thu, 3 Sep 2015 21:52:44 +0000 (21:52 +0000)]
Merge "move init.trace.rc to frameworks/native"
Tom Cherry [Thu, 3 Sep 2015 21:15:24 +0000 (14:15 -0700)]
move init.trace.rc to frameworks/native
init.trace.rc will be renamed to atrace.rc and use the LOCAL_INIT_RC
mechanism to be included on /system appropriately.
Bug
23186545
Change-Id: Ic5833b4bb6e6364e4fef6ab4882ae75f8f3856e9
Prashant Malani [Thu, 3 Sep 2015 18:36:05 +0000 (18:36 +0000)]
am
07da55f9: am
2f7531fb: am
13c63825: am
e35c7d65: Add body sensors app op for custom sensors
* commit '
07da55f93377a134ce31eace004d9975eeffa888':
Add body sensors app op for custom sensors
Prashant Malani [Thu, 3 Sep 2015 18:26:07 +0000 (18:26 +0000)]
am
2f7531fb: am
13c63825: am
e35c7d65: Add body sensors app op for custom sensors
* commit '
2f7531fb7a5d0c764c222f5acae0b487578629ab':
Add body sensors app op for custom sensors
Prashant Malani [Thu, 3 Sep 2015 18:14:43 +0000 (18:14 +0000)]
am
13c63825: am
e35c7d65: Add body sensors app op for custom sensors
* commit '
13c638255f2223cb9c455d519ff1003fc0221537':
Add body sensors app op for custom sensors
Prashant Malani [Thu, 3 Sep 2015 17:26:13 +0000 (17:26 +0000)]
am
e35c7d65: Add body sensors app op for custom sensors
* commit '
e35c7d65bb3c226fe3c5fc5e3933f64f0963eaeb':
Add body sensors app op for custom sensors
Prashant Malani [Fri, 21 Aug 2015 00:19:05 +0000 (17:19 -0700)]
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
Nick Armstrong-Crews [Wed, 2 Sep 2015 20:00:52 +0000 (13:00 -0700)]
Add KEYCODE_SOFT_SLEEP for Ungaze.
BUG: b/
23589870
Change-Id: I9bb575fe97bfae926ef4db37615e88057b81480c
Yasuhiro Matsuda [Wed, 2 Sep 2015 13:14:08 +0000 (13:14 +0000)]
am
d8ffffa9: am
40a8bb3b: Merge "Add a tag for tracing system server."
* commit '
d8ffffa9b660e8ee4b7294b8b2422d05829dfb7e':
Add a tag for tracing system server.
Yasuhiro Matsuda [Wed, 2 Sep 2015 13:02:51 +0000 (13:02 +0000)]
am
40a8bb3b: Merge "Add a tag for tracing system server."
* commit '
40a8bb3b2290f77a90735633eab350133f9bb9d2':
Add a tag for tracing system server.
Yasuhiro Matsuda [Wed, 2 Sep 2015 12:54:23 +0000 (12:54 +0000)]
Merge "Add a tag for tracing system server."
Dan Willemsen [Tue, 1 Sep 2015 16:49:45 +0000 (16:49 +0000)]
am
905dc8b7: am
ce92141c: Merge "Whitelist windows module"
* commit '
905dc8b76a98268a8047358ac55e14b4db18de8b':
Whitelist windows module
Nick Kralevich [Tue, 1 Sep 2015 16:37:33 +0000 (09:37 -0700)]
resolved conflicts for merge of
335e0e08 to mnc-dr-dev-plus-aosp
Change-Id: I77587cf9128b003ed0f77ddfe11e688dcfe37a9c
Dan Willemsen [Tue, 1 Sep 2015 16:37:04 +0000 (16:37 +0000)]
am
ce92141c: Merge "Whitelist windows module"
* commit '
ce92141cbdfeae302fcc1d5e4b4b261c783feaf7':
Whitelist windows module