OSDN Git Service
Pablo Ceballos [Mon, 14 Sep 2015 21:40:00 +0000 (21:40 +0000)]
Merge "Remove usage of SharedBuffer"
Pablo Ceballos [Mon, 14 Sep 2015 18:28:13 +0000 (18:28 +0000)]
Merge "native: Rename mBuf to mSlot"
Haixia Shi [Mon, 14 Sep 2015 18:13:29 +0000 (18:13 +0000)]
Merge "libgui: Fix missing va_end in Surface::hook_perform()"
Haixia Shi [Mon, 14 Sep 2015 18:02:18 +0000 (11:02 -0700)]
libgui: Fix missing va_end in Surface::hook_perform()
BUG=
23667255
TEST=libgui builds and volantis still works
Change-Id: I01de6ade6a47072c3a32c3eedc8568b1fd571363
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
Change-Id: I8fa17beed57936648c7b4defc9219dff1d5b337f
Dan Austin [Thu, 10 Sep 2015 22:20:22 +0000 (22:20 +0000)]
am
0823223c: am
f0f131f3: am
6c8c8138: Merge "Benign unsigned integer overflow in Parcel"
* commit '
0823223c6fa6b97fd15d11de5ddb38b21fccf2de':
Benign unsigned integer overflow in Parcel
Dan Austin [Thu, 10 Sep 2015 22:20:21 +0000 (22:20 +0000)]
am
1769e697: am
6d59e98b: am
8c77ec50: Merge "Enable fsanitize integer in ui"
* commit '
1769e697542bd5fac2014bb7eb15210e6cdc20d3':
Enable fsanitize integer in ui
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 15:07:29 +0000 (15:07 +0000)]
am
37616292: am
8e2a4f27: am
bf04509f: Merge "Enable fsanitize integer in binder"
* commit '
376162928b9464fbd31066eeee34ae6f878d3652':
Enable fsanitize integer in binder
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
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:52:35 +0000 (07:52 +0000)]
am
c3268ada: am
c2874048: am
5ca0c2ed: am
624408ee: Merge "Map realtime to clock_monotonic." into mnc-dr-dev
* commit '
c3268ada4d95de3ab61dc8c44b4ddea2969353d6':
Map realtime to clock_monotonic.
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 19:47:27 +0000 (12:47 -0700)]
resolved conflicts for
eba63c33 to master
Change-Id: I9f7744f63adeb9961547487453f0526cdd99dbbd
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:31:43 +0000 (02:31 +0000)]
am
afdbddbe: am
e5ce0db8: am
f090d598: am
3e4c8ccc: Merge "SF: Add colorTransform to DisplayInfo" into mnc-dr-dev
* commit '
afdbddbef57b3ffafa5b6a2107f37fda06dec9d4':
SF: Add colorTransform to DisplayInfo
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:36:10 +0000 (22:36 +0000)]
am
4ebbcb13: am
5943d9bc: am
477b1e87: Merge "move init.trace.rc to frameworks/native"
* commit '
4ebbcb1385623001b10431bdfaba6abaf7061dcf':
move init.trace.rc to frameworks/native
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:46:54 +0000 (18:46 +0000)]
am
be8dbebe: am
07da55f9: am
2f7531fb: am
13c63825: am
e35c7d65: Add body sensors app op for custom sensors
* commit '
be8dbebed2319b299bf16c09b792acd1889d4487':
Add body sensors app op for custom sensors
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:23:19 +0000 (13:23 +0000)]
am
1debd697: am
d8ffffa9: am
40a8bb3b: Merge "Add a tag for tracing system server."
* commit '
1debd697581f97cc271d740c835102b740b1f121':
Add a tag for tracing system server.
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 17:04:43 +0000 (17:04 +0000)]
am
fe54df2a: am
905dc8b7: am
ce92141c: Merge "Whitelist windows module"
* commit '
fe54df2ad3244d1cb745a6aac868654f0fc05315':
Whitelist windows module
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:49:33 +0000 (16:49 +0000)]
am
4b69cbd6: resolved conflicts for merge of
335e0e08 to mnc-dr-dev-plus-aosp
* commit '
4b69cbd6e95da7a209f839804e0fef7494a15459':
include/android/sensor: add enum for LINEAR_ACCELERATION
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
Nick Kralevich [Tue, 1 Sep 2015 15:58:18 +0000 (08:58 -0700)]
resolved conflicts for merge of
3821feac to stage-aosp-master
Change-Id: Icc17d2b7dc26eadf99b2c6967cceaa54ae38e617
Dan Stoza [Mon, 31 Aug 2015 19:06:48 +0000 (12:06 -0700)]
SF: Add colorTransform to DisplayInfo
Adds the colorTransform field, which defines a vendor-specific color
transform (e.g., wide gamut, sRGB, etc.) to the DisplayInfo class, and
populates it from the HWC interface.
Bug:
20853317
Change-Id: I153edc36a361407656f3eb5082b96c2da2ecbec7
Dan Willemsen [Mon, 31 Aug 2015 19:30:20 +0000 (19:30 +0000)]
Merge "Whitelist windows module"
Martijn Coenen [Wed, 15 Jul 2015 12:25:23 +0000 (14:25 +0200)]
Map realtime to clock_monotonic.
This maps a monotonic timestamp to the
corresponding real-time timestamp, which
can be used to match up the traces with
other logs that use real-time.
Also write clock_sync records first instead of at
the end, to avoid not being to write it due to the
buffer being full.
Bug:
23668823
Change-Id: I644aeea496197e194ec30f808f754e3e043d905f
Johan Euphrosine [Sat, 29 Aug 2015 04:15:16 +0000 (04:15 +0000)]
Merge "include/android/sensor: add enum for LINEAR_ACCELERATION"
Elliott Hughes [Sat, 29 Aug 2015 03:57:45 +0000 (03:57 +0000)]
am
2fcd675b: am
e9a779bf: am
1159b181: Merge "ignore SIGPIPE signal in native services"
* commit '
2fcd675b40ad9c94c1ff9506cdea63a48a81c9d6':
ignore SIGPIPE signal in native services
Elliott Hughes [Sat, 29 Aug 2015 03:50:09 +0000 (03:50 +0000)]
am
e9a779bf: am
1159b181: Merge "ignore SIGPIPE signal in native services"
* commit '
e9a779bf5367ead7ddbd532828d8027a34b4748c':
ignore SIGPIPE signal in native services
Elliott Hughes [Sat, 29 Aug 2015 03:43:57 +0000 (03:43 +0000)]
am
1159b181: Merge "ignore SIGPIPE signal in native services"
* commit '
1159b18177c7247884d7c90c11abfe5aae39cb34':
ignore SIGPIPE signal in native services
Elliott Hughes [Sat, 29 Aug 2015 03:37:09 +0000 (03:37 +0000)]
Merge "ignore SIGPIPE signal in native services"
Young-Ho Cha [Fri, 28 Aug 2015 10:55:18 +0000 (19:55 +0900)]
ignore SIGPIPE signal in native services
When run dump method via dumpsys command with invalid pipe fd, native
services can crash with SIGPIPE.
So ignore SIGPIPE signal.
Bug: https://code.google.com/p/android/issues/detail?id=184099
Change-Id: Icb15e0dff34a245c08c1b4c4bed51992ae382da4
Signed-off-by: Young-Ho Cha <ganadist@gmail.com>
Glenn Kasten [Sat, 29 Aug 2015 01:34:25 +0000 (01:34 +0000)]
am
aa16b576: am
dd893651: am
dcdc1610: am
fb1c507b: am
80402da0: Add XML for pro audio feature
* commit '
aa16b576b55ae2bbfaad0ced2cd36b2263a843c9':
Add XML for pro audio feature
Glenn Kasten [Sat, 29 Aug 2015 00:53:41 +0000 (00:53 +0000)]
am
dd893651: am
dcdc1610: am
fb1c507b: am
80402da0: Add XML for pro audio feature
* commit '
dd893651231d685012345fa08ef9bc3051f46c98':
Add XML for pro audio feature
Glenn Kasten [Sat, 29 Aug 2015 00:43:56 +0000 (00:43 +0000)]
am
dcdc1610: am
fb1c507b: am
80402da0: Add XML for pro audio feature
* commit '
dcdc161063640cf8666a45b8dfd6acf063476acb':
Add XML for pro audio feature
Glenn Kasten [Sat, 29 Aug 2015 00:35:33 +0000 (00:35 +0000)]
am
fb1c507b: am
80402da0: Add XML for pro audio feature
* commit '
fb1c507b5e442fc8bac059816a3a1534152cd7c4':
Add XML for pro audio feature
Glenn Kasten [Sat, 29 Aug 2015 00:25:52 +0000 (00:25 +0000)]
am
80402da0: Add XML for pro audio feature
* commit '
80402da0dec36a585a014a8ca974e28ef9034722':
Add XML for pro audio feature
Pablo Ceballos [Fri, 28 Aug 2015 23:09:03 +0000 (23:09 +0000)]
Merge "BQ: Get rid of setBufferCount"
Johan Euphrosine [Fri, 21 Aug 2015 01:13:43 +0000 (18:13 -0700)]
include/android/sensor: add enum for LINEAR_ACCELERATION
Change-Id: I6e387f905ba87bde810952daf939ba0f529d18b8
Dan Willemsen [Fri, 28 Aug 2015 21:09:44 +0000 (14:09 -0700)]
Whitelist windows module
Bug:
23566667
Change-Id: I4fa1243421885a0c1a8febbbcefb0d7e9cdcc99b
Glenn Kasten [Fri, 28 Aug 2015 03:09:39 +0000 (20:09 -0700)]
Add XML for pro audio feature
Bug:
23604253
Change-Id: I480cf0a46c286badc6fd95a3b42e6cb1ed056b1b
Sharvil Nanavati [Thu, 27 Aug 2015 22:09:29 +0000 (22:09 +0000)]
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/native
Pablo Ceballos [Thu, 27 Aug 2015 21:56:20 +0000 (21:56 +0000)]
Merge "BQ: add setMaxDequeuedBufferCount"
Ruchi Kandoi [Thu, 27 Aug 2015 21:42:52 +0000 (21:42 +0000)]
am
35b3c9e1: am
2057e777: (-s ours) am
cf1fedef: am
2acadb3f: Merge "BatteryProperties: Adds batteryCycleCount, batteryCurrent, batteryFullCharge fields in the the battery properties."
* commit '
35b3c9e1b12aba10c7a541389b0152060982c11c':
Jesse Hall [Thu, 27 Aug 2015 21:42:51 +0000 (21:42 +0000)]
am
647800ac: am
05d902b7: (-s ours) am
d3bfedbb: am
f364393a: Merge "libagl: Fix buffer read overrun in eglCreatePbufferSurface"
* commit '
647800ac46c6d1fe01551ad73d602f263242602f':
Tom Cherry [Thu, 27 Aug 2015 21:42:51 +0000 (21:42 +0000)]
am
7b0498b7: am
a1f3f54c: (-s ours) am
32592270: am
64e13880: Merge "bundle init.rc contents with its service"
* commit '
7b0498b7f4da8e0202ca33172db22d7c61422fca':
Elliott Hughes [Thu, 27 Aug 2015 21:42:50 +0000 (21:42 +0000)]
am
4ce9e23f: am
b1fff84f: (-s ours) am
a6d2ff29: am
110ddef1: Merge "binder: Change from C11 <stdatomic.h> to C++11 <atomic>."
* commit '
4ce9e23fa7d4dc4646dd08066271ed4cfe71ec60':
Riley Andrews [Thu, 27 Aug 2015 21:42:49 +0000 (21:42 +0000)]
am
9319019a: am
43ab57cc: (-s ours) am
7a1ccf7c: am
d974a364: Merge "binder: Add a throughput performance test for binder."
* commit '
9319019a50b70b910902719ef01fc16f3dee7887':
Riley Andrews [Thu, 27 Aug 2015 21:42:48 +0000 (21:42 +0000)]
am
c0b3a9ac: am
2fa4b0ce: (-s ours) am
7bd45d00: am
4997a57a: Merge "Tracing for binder locks/transactions"
* commit '
c0b3a9ac6be27cf6f885d925f847446fad444383':
Elliott Hughes [Thu, 27 Aug 2015 21:42:47 +0000 (21:42 +0000)]
am
d1bba9da: am
c6ada3b1: (-s ours) am
6a846dd5: am
5f5a0e0f: Merge "Lose HAVE_ANDROID_OS from frameworks/native."
* commit '
d1bba9da5143d5e398084b8c6bf5189b780734ab':
Andreas Gampe [Thu, 27 Aug 2015 21:42:46 +0000 (21:42 +0000)]
am
e21a347e: am
18343a2f: (-s ours) SensorService: Fix some warnings
* commit '
e21a347e9b905764c79338de31b990d131a8c62d':
SensorService: Fix some warnings
Mark Salyzyn [Thu, 27 Aug 2015 21:42:44 +0000 (21:42 +0000)]
am
4e439793: am
22844544: (-s ours) am
ecc0763e: dumpstate: add logcat -b all -S
* commit '
4e43979374b24fc1826dd539dcdc3cb3795c1a40':
Nick Kralevich [Thu, 27 Aug 2015 21:42:42 +0000 (21:42 +0000)]
am
92b5a2fc: am
2379e15d: (-s ours) am
0e3234b7: am
1efe1bdd: Merge "More O_DIRECTORY | O_NOFOLLOW changes"
* commit '
92b5a2fc2558784e71fc71a970265d79a15785d6':
Nick Kralevich [Thu, 27 Aug 2015 21:42:39 +0000 (21:42 +0000)]
am
3a355db5: am
6611bd64: (-s ours) am
c45bad1d: am
a1b2eaa2: Merge "installd _delete_dir_contents: add O_NOFOLLOW"
* commit '
3a355db5f22f678de30007bfe1d8741a23f8ebe6':
Michael Wright [Thu, 27 Aug 2015 21:42:37 +0000 (21:42 +0000)]
am
ec409668: (-s ours) am
c80decd3: (-s ours) am
62ec2dd5: DO NOT MERGE Add new media navigation keys.
* commit '
ec40966869ebc836626c666defebdb4c7d0664cb':
Todd Kennedy [Thu, 27 Aug 2015 21:42:36 +0000 (21:42 +0000)]
am
d0330eb0: am
8728064c: (-s ours) am
f3486868: am
2bb9861d: Merge "Add a trace constant for PackageManager"
* commit '
d0330eb0b0e68a597e39cca32dbc25d977f1553e':
Andreas Gampe [Thu, 27 Aug 2015 21:42:35 +0000 (21:42 +0000)]
am
9010988f: am
d5dceea5: (-s ours) am
9079207a: am
dfd082b9: Merge "Native/opengl: Remove unused variables from test"
* commit '
9010988f55da1fd89b696bad283cba8dc176cbdf':
Naveen Leekha [Thu, 27 Aug 2015 21:42:34 +0000 (21:42 +0000)]
am
1843d483: am
73d983a3: (-s ours) am
ea2afa46: Merge "Fix parsing of extension string" into mnc-dev
* commit '
1843d48330fbe202241da4ab61e8ba1bc8a17dfd':
Mark Salyzyn [Thu, 27 Aug 2015 21:42:32 +0000 (21:42 +0000)]
am
c67160a1: am
56c6da78: (-s ours) am
eb7718b1: am
5b7e9dc7: Merge "dumpstate: add logcat -b all -S"
* commit '
c67160a1444f0467cf89cda5950df9654e2699f9':
Dan Stoza [Thu, 27 Aug 2015 21:42:31 +0000 (21:42 +0000)]
am
bf076c5a: am
dc54ab50: (-s ours) am
d87defaf: SF: Allow present if sideband stream changed
* commit '
bf076c5ae4c0880caa48dd01ff03ce0105922218':
Yasuhiro Matsuda [Thu, 27 Aug 2015 21:42:30 +0000 (21:42 +0000)]
am
acbe4f5b: am
d0cbde8e: (-s ours) am
607b913e: am
366c38f8: Merge "Enable atrace to read categories from file."
* commit '
acbe4f5b7fb500d290963b8101f05f6658da6c87':
Narayan Kamath [Thu, 27 Aug 2015 21:42:29 +0000 (21:42 +0000)]
am
27dd1647: am
901367bf: (-s ours) am
a29db50c: Merge "Revert "Bug fix in SensorManager."" into mnc-dev
* commit '
27dd16471a0683a351b94fb213683a1aec301a9f':
Aravind Akella [Thu, 27 Aug 2015 21:42:28 +0000 (21:42 +0000)]
am
667dd60c: am
d9d1fd5b: (-s ours) am
2376bd68: Merge "Bug fix in SensorManager." into mnc-dev
* commit '
667dd60cf6334cee92eda74203d1193669d8cc9a':
Nick Kralevich [Thu, 27 Aug 2015 21:42:26 +0000 (21:42 +0000)]
am
e06f6d7a: am
4aec0446: (-s ours) am
ed32594d: am
2cb9994c: Merge "dumpstate: remove unnecessary mkdir"
* commit '
e06f6d7a85f005d906ee37b94eb59d4da10a178c':
Jim Miller [Thu, 27 Aug 2015 21:42:25 +0000 (21:42 +0000)]
am
95918059: am
71fb8d62: (-s ours) am
bf7cd01a: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature list" into mnc-dev
* commit '
959180590ceacf764694a5241c7d084ad9d9a5c9':
Chenjie Luo [Thu, 27 Aug 2015 21:42:23 +0000 (21:42 +0000)]
am
cc1bda9f: am
4468d325: (-s ours) am
99426810: Merge "Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors." into mnc-dev
* commit '
cc1bda9fe4ed08e1ec5aa6d8561737f8f5a61e8c':
Qiwen Zhao [Thu, 27 Aug 2015 21:42:22 +0000 (21:42 +0000)]
am
1bda485e: (-s ours) am
61fc4c8b: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at
f892f91.
* commit '
1bda485e2b06b695c1a52384f20683d2667e220e':
OSDN Git Service
