OSDN Git Service
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: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
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
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
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: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 Willemsen [Mon, 31 Aug 2015 19:30:20 +0000 (19:30 +0000)]
Merge "Whitelist windows module"
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: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>
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
Ruchi Kandoi [Wed, 26 Aug 2015 00:22:12 +0000 (00:22 +0000)]
am
cf1fedef: am
2acadb3f: Merge "BatteryProperties: Adds batteryCycleCount, batteryCurrent, batteryFullCharge fields in the the battery properties."
* commit '
cf1fedef98db7a5ae30685cdc47b5b6e107fba50':
BatteryProperties: Adds batteryCycleCount, batteryCurrent, batteryFullCharge fields in the the battery properties.
Ruchi Kandoi [Tue, 25 Aug 2015 23:53:37 +0000 (23:53 +0000)]
am
2acadb3f: Merge "BatteryProperties: Adds batteryCycleCount, batteryCurrent, batteryFullCharge fields in the the battery properties."
* commit '
2acadb3f26b3f9b7f2ae7c1bca219ada94066462':
BatteryProperties: Adds batteryCycleCount, batteryCurrent, batteryFullCharge fields in the the battery properties.
Ruchi Kandoi [Tue, 25 Aug 2015 23:45:51 +0000 (23:45 +0000)]
Merge "BatteryProperties: Adds batteryCycleCount, batteryCurrent, batteryFullCharge fields in the the battery properties."
Ruchi Kandoi [Thu, 13 Aug 2015 00:49:42 +0000 (17:49 -0700)]
BatteryProperties: Adds batteryCycleCount, batteryCurrent,
batteryFullCharge fields in the the battery properties.
Bug:
22981343
Change-Id: I426b4b7d1eb544d2b1d97d87ae1eba0fdf35c503
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
Jesse Hall [Sat, 22 Aug 2015 02:56:09 +0000 (02:56 +0000)]
am
d3bfedbb: am
f364393a: Merge "libagl: Fix buffer read overrun in eglCreatePbufferSurface"
* commit '
d3bfedbb1fc6296b561e60eac19581a6f1705f9e':
libagl: Fix buffer read overrun in eglCreatePbufferSurface
Jesse Hall [Sat, 22 Aug 2015 02:49:27 +0000 (02:49 +0000)]
am
f364393a: Merge "libagl: Fix buffer read overrun in eglCreatePbufferSurface"
* commit '
f364393a01824bf4d805b6fffc78bb00d426eb9f':
libagl: Fix buffer read overrun in eglCreatePbufferSurface
Jesse Hall [Sat, 22 Aug 2015 02:40:45 +0000 (02:40 +0000)]
Merge "libagl: Fix buffer read overrun in eglCreatePbufferSurface"
Tom Cherry [Fri, 21 Aug 2015 18:20:25 +0000 (18:20 +0000)]
am
32592270: am
64e13880: Merge "bundle init.rc contents with its service"
* commit '
32592270d40d6060e19aa97949aee72c8aca0807':
bundle init.rc contents with its service
Tom Cherry [Fri, 21 Aug 2015 17:52:48 +0000 (17:52 +0000)]
am
64e13880: Merge "bundle init.rc contents with its service"
* commit '
64e138803478c22cac598b143b3f109d6220a167':
bundle init.rc contents with its service
Tom Cherry [Fri, 21 Aug 2015 17:42:30 +0000 (17:42 +0000)]
Merge "bundle init.rc contents with its service"
Jesse Hall [Fri, 21 Aug 2015 14:41:46 +0000 (07:41 -0700)]
libagl: Fix buffer read overrun in eglCreatePbufferSurface
The code was assuming that EGL_NONE==0, which isn't true.
Bug:
23403170
Change-Id: Ic1eccdef086b4d610bd78dbb6b2ae883c91dc322
Elliott Hughes [Thu, 20 Aug 2015 19:31:35 +0000 (19:31 +0000)]
am
a6d2ff29: am
110ddef1: Merge "binder: Change from C11 <stdatomic.h> to C++11 <atomic>."
* commit '
a6d2ff29c4920b440b16bc6ceaa90710361b9be9':
binder: Change from C11 <stdatomic.h> to C++11 <atomic>.
Elliott Hughes [Thu, 20 Aug 2015 01:13:28 +0000 (01:13 +0000)]
am
110ddef1: Merge "binder: Change from C11 <stdatomic.h> to C++11 <atomic>."
* commit '
110ddef1da19c03dd5e167680d00f48e1377da9d':
binder: Change from C11 <stdatomic.h> to C++11 <atomic>.
Elliott Hughes [Thu, 20 Aug 2015 01:07:16 +0000 (01:07 +0000)]
Merge "binder: Change from C11 <stdatomic.h> to C++11 <atomic>."
Tom Cherry [Fri, 14 Aug 2015 20:01:23 +0000 (13:01 -0700)]
bundle init.rc contents with its service
Bug:
23186545
Change-Id: I2a70a39122b146d5bbc9b55156e769782e011bff
Bailey Forrest [Wed, 19 Aug 2015 00:15:10 +0000 (17:15 -0700)]
binder: Change from C11 <stdatomic.h> to C++11 <atomic>.
Change-Id: Ib831a9ccfcc7089940d37883d860574359c270e2
Riley Andrews [Mon, 17 Aug 2015 21:21:53 +0000 (21:21 +0000)]
am
7a1ccf7c: am
d974a364: Merge "binder: Add a throughput performance test for binder."
* commit '
7a1ccf7c7d1dd0defa1a82d973a8b80f3370c52c':
binder: Add a throughput performance test for binder.
Riley Andrews [Mon, 17 Aug 2015 21:08:45 +0000 (21:08 +0000)]
am
d974a364: Merge "binder: Add a throughput performance test for binder."
* commit '
d974a3647bd371886093738ab16485c943cb5bad':
binder: Add a throughput performance test for binder.
Riley Andrews [Mon, 17 Aug 2015 20:58:26 +0000 (20:58 +0000)]
Merge "binder: Add a throughput performance test for binder."
Riley Andrews [Tue, 11 Aug 2015 20:19:53 +0000 (13:19 -0700)]
binder: Add a throughput performance test for binder.
Change-Id: I04801cd505a439307f2a963f6267db1831b3829f
Riley Andrews [Wed, 12 Aug 2015 23:50:00 +0000 (23:50 +0000)]
am
7bd45d00: am
4997a57a: Merge "Tracing for binder locks/transactions"
* commit '
7bd45d0010622e559f7795243ec8e548f641266b':
Tracing for binder locks/transactions
Riley Andrews [Wed, 12 Aug 2015 23:42:34 +0000 (23:42 +0000)]
am
4997a57a: Merge "Tracing for binder locks/transactions"
* commit '
4997a57a9ae90bbb058dec90222d423a7de0e7e7':
Tracing for binder locks/transactions
Riley Andrews [Wed, 12 Aug 2015 23:36:31 +0000 (23:36 +0000)]
Merge "Tracing for binder locks/transactions"
Elliott Hughes [Wed, 12 Aug 2015 23:21:58 +0000 (23:21 +0000)]
am
6a846dd5: am
5f5a0e0f: Merge "Lose HAVE_ANDROID_OS from frameworks/native."
* commit '
6a846dd51885df861f4e1e30fcca86b9dd2f4092':
Lose HAVE_ANDROID_OS from frameworks/native.
Elliott Hughes [Wed, 12 Aug 2015 22:38:47 +0000 (22:38 +0000)]
am
5f5a0e0f: Merge "Lose HAVE_ANDROID_OS from frameworks/native."
* commit '
5f5a0e0ffd89c98742ddedaf01fa13220a542272':
Lose HAVE_ANDROID_OS from frameworks/native.
Elliott Hughes [Wed, 12 Aug 2015 22:30:07 +0000 (22:30 +0000)]
Merge "Lose HAVE_ANDROID_OS from frameworks/native."
Elliott Hughes [Wed, 12 Aug 2015 22:27:47 +0000 (15:27 -0700)]
Lose HAVE_ANDROID_OS from frameworks/native.
Change-Id: I8e6af2a46a9d875192fc7957ada9b5f66d84bad6
Andreas Gampe [Tue, 28 Jul 2015 20:49:04 +0000 (13:49 -0700)]
SensorService: Fix some warnings
For build-system CFLAGS clean-up, remove unused variables.
Also fix some warnings related to format strings, and signed
comparisons.
Bug:
18632512
(cherry picked from commit
d4036b6b7f9609fe09efabdbfbb8c8f9428f76f7)
Change-Id: I5e48dce36678c12069c0e162b920870de81b89f2
Mark Salyzyn [Tue, 11 Aug 2015 23:16:06 +0000 (23:16 +0000)]
am
ecc0763e: dumpstate: add logcat -b all -S
* commit '
ecc0763e6c96c418ea4ee6c993d58d16a58407b3':
dumpstate: add logcat -b all -S
Mark Salyzyn [Thu, 30 Jul 2015 21:57:09 +0000 (14:57 -0700)]
dumpstate: add logcat -b all -S
(cherry pick from commit
e3c4df96083231b519dad919fd0ed6624100b368)
- For those that are proud to call themselves logspam police
- Every time someone declares that something is too chatty, or that
they lost their logs because they were declared too chatty and
their associated logs were aggresively pruned we generally
ask them to report the logger statistics to pinpoint what software
product that is the elephant in the room.
- Every time we want to spawn a new 'stop being so spammy' bug spawned
off a bugreport collected for another purpose, we *wish* we had the
logger statistics to help add gravitas to the claim that some piece
of software is the top, or near the top, polluter.
Bug:
22351810
Change-Id: Ifae33cd21d0ae2917a3b4381502d723725b1701c
Nick Kralevich [Mon, 10 Aug 2015 21:07:50 +0000 (21:07 +0000)]
am
0e3234b7: am
1efe1bdd: Merge "More O_DIRECTORY | O_NOFOLLOW changes"
* commit '
0e3234b7f11048d8291d5427cc0acfb77ba6b843':
More O_DIRECTORY | O_NOFOLLOW changes
Nick Kralevich [Mon, 10 Aug 2015 21:01:03 +0000 (21:01 +0000)]
am
1efe1bdd: Merge "More O_DIRECTORY | O_NOFOLLOW changes"
* commit '
1efe1bdde9baf40741febbf965ce01a4168a7860':
More O_DIRECTORY | O_NOFOLLOW changes
Nick Kralevich [Mon, 10 Aug 2015 20:53:31 +0000 (20:53 +0000)]
Merge "More O_DIRECTORY | O_NOFOLLOW changes"
Nick Kralevich [Mon, 10 Aug 2015 20:43:00 +0000 (13:43 -0700)]
More O_DIRECTORY | O_NOFOLLOW changes
Fix a few other spots where we're not using O_NOFOLLOW
with O_DIRECTORY.
Add O_CLOEXEC for good measure.
https://code.google.com/p/android/issues/detail?id=181945
Bug:
23044050
Change-Id: Ib535cbba29cdd587443ea9e1e75831f57fd7a93c
Nick Kralevich [Mon, 10 Aug 2015 20:08:07 +0000 (20:08 +0000)]
am
c45bad1d: am
a1b2eaa2: Merge "installd _delete_dir_contents: add O_NOFOLLOW"
* commit '
c45bad1dc14a7af1e72ad3585b3b057c38fcec3f':
installd _delete_dir_contents: add O_NOFOLLOW
Nick Kralevich [Mon, 10 Aug 2015 19:53:59 +0000 (19:53 +0000)]
am
a1b2eaa2: Merge "installd _delete_dir_contents: add O_NOFOLLOW"
* commit '
a1b2eaa2644843787c4ed8c2f62faa125b40d3f7':
installd _delete_dir_contents: add O_NOFOLLOW
Nick Kralevich [Mon, 10 Aug 2015 19:48:39 +0000 (19:48 +0000)]
Merge "installd _delete_dir_contents: add O_NOFOLLOW"
Nick Kralevich [Mon, 10 Aug 2015 19:28:22 +0000 (12:28 -0700)]
installd _delete_dir_contents: add O_NOFOLLOW
Add O_NOFOLLOW to make sure we're not following symlinks.
https://code.google.com/p/android/issues/detail?id=181945
Bug:
23044050
Change-Id: I3408309fd401aefb6ebecb2a052bba198eed7633
Michael Wright [Fri, 7 Aug 2015 16:57:38 +0000 (16:57 +0000)]
am
62ec2dd5: DO NOT MERGE Add new media navigation keys.
* commit '
62ec2dd563eb9f537d76e6bb9c13d630f5ab01dc':
DO NOT MERGE Add new media navigation keys.
Michael Wright [Thu, 6 Aug 2015 14:17:31 +0000 (15:17 +0100)]
DO NOT MERGE Add new media navigation keys.
Bug:
22059484
Change-Id: I587eb7622555194f18f403da583e3b70656a530e
Yasuhiro Matsuda [Tue, 30 Jun 2015 16:46:25 +0000 (01:46 +0900)]
Add a tag for tracing system server.
This change is needed for
https://android-review.googlesource.com/#/c/157562/
BUG:
21739901
Change-Id: Ic4616065749236fbde9263b8f1898c434913564a
Todd Kennedy [Mon, 3 Aug 2015 18:05:22 +0000 (18:05 +0000)]
am
f3486868: am
2bb9861d: Merge "Add a trace constant for PackageManager"
* commit '
f3486868a80b1e0619738b6200142b8cb9742679':
Add a trace constant for PackageManager
Todd Kennedy [Mon, 3 Aug 2015 17:54:55 +0000 (17:54 +0000)]
am
2bb9861d: Merge "Add a trace constant for PackageManager"
* commit '
2bb9861d481b9a7e5e3001ebb9592f382d53b5e4':
Add a trace constant for PackageManager
Todd Kennedy [Mon, 3 Aug 2015 17:44:44 +0000 (17:44 +0000)]
Merge "Add a trace constant for PackageManager"
Andreas Gampe [Mon, 3 Aug 2015 17:09:14 +0000 (17:09 +0000)]
am
9079207a: am
dfd082b9: Merge "Native/opengl: Remove unused variables from test"
* commit '
9079207a14e097be2242692f3d68b2c340ad194a':
Native/opengl: Remove unused variables from test
Andreas Gampe [Mon, 3 Aug 2015 17:02:44 +0000 (17:02 +0000)]
am
dfd082b9: Merge "Native/opengl: Remove unused variables from test"
* commit '
dfd082b92c8452b0544557cef6373eba9ec30adb':
Native/opengl: Remove unused variables from test
Todd Kennedy [Fri, 31 Jul 2015 21:36:20 +0000 (14:36 -0700)]
Add a trace constant for PackageManager
Change-Id: Icd9afc86c88296919e4750d71cb0aef314194bee
Andreas Gampe [Mon, 3 Aug 2015 16:55:45 +0000 (16:55 +0000)]
Merge "Native/opengl: Remove unused variables from test"
Andreas Gampe [Mon, 3 Aug 2015 15:57:34 +0000 (08:57 -0700)]
Native/opengl: Remove unused variables from test
For build-system CFLAGS clean-up.
Bug:
18632512
(cherry picked from commit
a75f729650b18478e3ff822dbf686406ed7f7169)
Change-Id: Ibe2d59c7e0677f02e4bf5214d34655cd300d5f15
Naveen Leekha [Mon, 3 Aug 2015 14:53:12 +0000 (14:53 +0000)]
am
ea2afa46: Merge "Fix parsing of extension string" into mnc-dev
* commit '
ea2afa460a2c2ee6c44406c1993e8bbacac838ba':
Fix parsing of extension string
Naveen Leekha [Mon, 3 Aug 2015 14:45:11 +0000 (14:45 +0000)]
Merge "Fix parsing of extension string" into mnc-dev
Mark Salyzyn [Fri, 31 Jul 2015 22:32:09 +0000 (22:32 +0000)]
am
eb7718b1: am
5b7e9dc7: Merge "dumpstate: add logcat -b all -S"
* commit '
eb7718b1d2f0f0a9a735b41d15c24761f5e4cfc9':
dumpstate: add logcat -b all -S
Mark Salyzyn [Fri, 31 Jul 2015 22:17:36 +0000 (22:17 +0000)]
am
5b7e9dc7: Merge "dumpstate: add logcat -b all -S"
* commit '
5b7e9dc7db79b6a4750efc628b81765b58a7cd92':
dumpstate: add logcat -b all -S
Mark Salyzyn [Fri, 31 Jul 2015 22:10:51 +0000 (22:10 +0000)]
Merge "dumpstate: add logcat -b all -S"
Mark Salyzyn [Thu, 30 Jul 2015 21:57:09 +0000 (14:57 -0700)]
dumpstate: add logcat -b all -S
- For those that are proud to call themselves logspam police
- Every time someone declares that something is too chatty, or that
they lost their logs because they were declared too chatty and
their associated logs were aggresively pruned we generally
ask them to report the logger statistics to pinpoint what software
product that is the elephant in the room.
- Every time we want to spawn a new 'stop being so spammy' bug spawned
off a bugreport collected for another purpose, we *wish* we had the
logger statistics to help add gravitas to the claim that some piece
of software is the top, or near the top, polluter.
Change-Id: Ifae33cd21d0ae2917a3b4381502d723725b1701c
Michael Lentine [Tue, 28 Jul 2015 23:30:10 +0000 (16:30 -0700)]
Fix parsing of extension string
Previously the parsing found the next space and then added the the difference
between the current position and space to the set of tokens. This improperly
generated empty strings if there were consecutive spaces or if spaces existed at
the beginning or end of strings. To fix this, the parse is modified to use
simple stringstream parsing.
Bug:
22709246
Change-Id: I9e32c07bbf984eadccdadf1dc34437fa0c46088b
Dan Stoza [Fri, 31 Jul 2015 15:44:53 +0000 (15:44 +0000)]
am
d87defaf: SF: Allow present if sideband stream changed
* commit '
d87defaf486ff4e9c0066754564851cfb7be49ed':
SF: Allow present if sideband stream changed
Yasuhiro Matsuda [Thu, 30 Jul 2015 08:05:12 +0000 (08:05 +0000)]
am
607b913e: am
366c38f8: Merge "Enable atrace to read categories from file."
* commit '
607b913e8a911a9acf8ea38c6ab2c60ca2ad702d':
Enable atrace to read categories from file.
Yasuhiro Matsuda [Thu, 30 Jul 2015 07:51:08 +0000 (07:51 +0000)]
am
366c38f8: Merge "Enable atrace to read categories from file."
* commit '
366c38f82393c8a3e9419c0dbe6320504a4d741b':
Enable atrace to read categories from file.
Yasuhiro Matsuda [Thu, 30 Jul 2015 07:42:08 +0000 (07:42 +0000)]
Merge "Enable atrace to read categories from file."
Dan Stoza [Wed, 29 Jul 2015 23:15:50 +0000 (16:15 -0700)]
SF: Allow present if sideband stream changed
Allows the sideband layer to be passed all the way to HWC instead of
getting blocked by the updated PTS tracking code.
Bug:
22291067
Change-Id: Ic2f20a7528e276fff054e86ca35789c26873b348
Narayan Kamath [Wed, 29 Jul 2015 10:05:22 +0000 (10:05 +0000)]
am
a29db50c: Merge "Revert "Bug fix in SensorManager."" into mnc-dev
* commit '
a29db50c448f8d00a544b925544f3dee725f7750':
Revert "Bug fix in SensorManager."
Narayan Kamath [Wed, 29 Jul 2015 09:41:23 +0000 (09:41 +0000)]
Merge "Revert "Bug fix in SensorManager."" into mnc-dev
Narayan Kamath [Wed, 29 Jul 2015 09:36:05 +0000 (09:36 +0000)]
Revert "Bug fix in SensorManager."
This reverts commit
869eb2089ec8a6286b944bfcff57e4cbe0c7e207.
Change-Id: I4fb865e3b18bbb011fa4e4b4732336930c3a45ae
Aravind Akella [Wed, 29 Jul 2015 00:38:23 +0000 (00:38 +0000)]
am
2376bd68: Merge "Bug fix in SensorManager." into mnc-dev
* commit '
2376bd6869f4cd835a351322d48d35567eceec4f':
Bug fix in SensorManager.
Aravind Akella [Wed, 29 Jul 2015 00:21:09 +0000 (00:21 +0000)]
Merge "Bug fix in SensorManager." into mnc-dev
Aravind Akella [Fri, 24 Jul 2015 18:08:41 +0000 (11:08 -0700)]
Bug fix in SensorManager.
If SensorService hasn't started when SensorManager instance is requested, keep retrying for a
longer duration.
Bug:
22529981
Change-Id: I4ba6b760608e34d79273aeb39568f0fa72fbaf9d
Nick Kralevich [Sun, 26 Jul 2015 06:16:04 +0000 (06:16 +0000)]
am
ed32594d: am
2cb9994c: Merge "dumpstate: remove unnecessary mkdir"
* commit '
ed32594d0bdfc2fb675d2e5fb0259d3d22b42aff':
dumpstate: remove unnecessary mkdir
Nick Kralevich [Sun, 26 Jul 2015 04:39:24 +0000 (04:39 +0000)]
am
2cb9994c: Merge "dumpstate: remove unnecessary mkdir"
* commit '
2cb9994c022e67c28f0e436035202928a000993c':
dumpstate: remove unnecessary mkdir
Nick Kralevich [Sun, 26 Jul 2015 04:26:11 +0000 (04:26 +0000)]
Merge "dumpstate: remove unnecessary mkdir"
Nick Kralevich [Sun, 26 Jul 2015 04:13:49 +0000 (21:13 -0700)]
dumpstate: remove unnecessary mkdir
/data/anr is now created in init.rc. This code is unnecessary.
Bug:
22385254
Change-Id: I4ea9c311d52eee7fb6b90235fbd12a4c9364d71f
Jim Miller [Fri, 24 Jul 2015 02:50:18 +0000 (02:50 +0000)]
am
bf7cd01a: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature list" into mnc-dev
* commit '
bf7cd01ab0fce5c76364f78e3b9fdba078c197c0':
Add FEATURE_FINGERPRINT to PackageManager's feature list
Jim Miller [Fri, 24 Jul 2015 02:41:02 +0000 (02:41 +0000)]
Merge "Add FEATURE_FINGERPRINT to PackageManager's feature list" into mnc-dev
Jim Miller [Thu, 23 Jul 2015 02:56:05 +0000 (19:56 -0700)]
Add FEATURE_FINGERPRINT to PackageManager's feature list
Fixes bug
22674557
Change-Id: I2ced132c1cb4f4b5166f9af288dd3e697fdcf92b
Chenjie Luo [Wed, 22 Jul 2015 20:18:06 +0000 (20:18 +0000)]
am
99426810: Merge "Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors." into mnc-dev
* commit '
99426810e4828719be84a0f8c186161578512e93':
Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors.
Chenjie Luo [Wed, 22 Jul 2015 06:26:27 +0000 (06:26 +0000)]
Merge "Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors." into mnc-dev
Qiwen Zhao [Tue, 21 Jul 2015 14:54:21 +0000 (07:54 -0700)]
DO NOT MERGE ANYWHERE. reset to mnc-dev at
f892f91.
OSDN Git Service
