OSDN Git Service
Ruchi Kandoi [Thu, 27 Aug 2015 05:13:11 +0000 (05:13 +0000)]
am
2057e777: (-s ours) am
cf1fedef: am
2acadb3f: Merge "BatteryProperties: Adds batteryCycleCount, batteryCurrent, batteryFullCharge fields in the the battery properties."
* commit '
2057e777b31b6904fd29eac562ee15526000902f':
Jesse Hall [Thu, 27 Aug 2015 05:13:10 +0000 (05:13 +0000)]
am
05d902b7: (-s ours) am
d3bfedbb: am
f364393a: Merge "libagl: Fix buffer read overrun in eglCreatePbufferSurface"
* commit '
05d902b7a377920354327125e680fa97eb8a13f8':
Tom Cherry [Thu, 27 Aug 2015 05:13:08 +0000 (05:13 +0000)]
am
a1f3f54c: (-s ours) am
32592270: am
64e13880: Merge "bundle init.rc contents with its service"
* commit '
a1f3f54c2752b4108f3b21baea6d5fd73738cbff':
Elliott Hughes [Thu, 27 Aug 2015 05:13:05 +0000 (05:13 +0000)]
am
b1fff84f: (-s ours) am
a6d2ff29: am
110ddef1: Merge "binder: Change from C11 <stdatomic.h> to C++11 <atomic>."
* commit '
b1fff84f676d44af8277d68f8122f220538db345':
Riley Andrews [Thu, 27 Aug 2015 05:13:03 +0000 (05:13 +0000)]
am
43ab57cc: (-s ours) am
7a1ccf7c: am
d974a364: Merge "binder: Add a throughput performance test for binder."
* commit '
43ab57ccbf2c0adfad5298b662675b59e52b2e01':
Riley Andrews [Thu, 27 Aug 2015 05:13:00 +0000 (05:13 +0000)]
am
2fa4b0ce: (-s ours) am
7bd45d00: am
4997a57a: Merge "Tracing for binder locks/transactions"
* commit '
2fa4b0ce3b94c4a15aad5d8dafc494e990d0edc2':
Elliott Hughes [Thu, 27 Aug 2015 05:12:59 +0000 (05:12 +0000)]
am
c6ada3b1: (-s ours) am
6a846dd5: am
5f5a0e0f: Merge "Lose HAVE_ANDROID_OS from frameworks/native."
* commit '
c6ada3b169827f581cd61749c6056c4209ebb650':
Andreas Gampe [Thu, 27 Aug 2015 05:12:58 +0000 (05:12 +0000)]
am
18343a2f: (-s ours) SensorService: Fix some warnings
* commit '
18343a2fd11583b884d1566a232a75b004fb3813':
SensorService: Fix some warnings
Mark Salyzyn [Thu, 27 Aug 2015 05:12:57 +0000 (05:12 +0000)]
am
22844544: (-s ours) am
ecc0763e: dumpstate: add logcat -b all -S
* commit '
2284454410faac03c50e5821844e96b151032735':
Nick Kralevich [Thu, 27 Aug 2015 05:12:56 +0000 (05:12 +0000)]
am
2379e15d: (-s ours) am
0e3234b7: am
1efe1bdd: Merge "More O_DIRECTORY | O_NOFOLLOW changes"
* commit '
2379e15da458aa9aac09c1834eb893540d522ac2':
Nick Kralevich [Thu, 27 Aug 2015 05:12:55 +0000 (05:12 +0000)]
am
6611bd64: (-s ours) am
c45bad1d: am
a1b2eaa2: Merge "installd _delete_dir_contents: add O_NOFOLLOW"
* commit '
6611bd6489b9efd3bc41c13aea71387891cef300':
Michael Wright [Thu, 27 Aug 2015 05:12:54 +0000 (05:12 +0000)]
am
c80decd3: (-s ours) am
62ec2dd5: DO NOT MERGE Add new media navigation keys.
* commit '
c80decd3f047aee96a73d0f1b4d81a89a80424c6':
Todd Kennedy [Thu, 27 Aug 2015 05:12:53 +0000 (05:12 +0000)]
am
8728064c: (-s ours) am
f3486868: am
2bb9861d: Merge "Add a trace constant for PackageManager"
* commit '
8728064cab62c423a2869b3353b6fc72e9e0a19c':
Andreas Gampe [Thu, 27 Aug 2015 05:12:51 +0000 (05:12 +0000)]
am
d5dceea5: (-s ours) am
9079207a: am
dfd082b9: Merge "Native/opengl: Remove unused variables from test"
* commit '
d5dceea52af1677714e2fc2b66543ac2a93ddcfe':
Naveen Leekha [Thu, 27 Aug 2015 05:12:50 +0000 (05:12 +0000)]
am
73d983a3: (-s ours) am
ea2afa46: Merge "Fix parsing of extension string" into mnc-dev
* commit '
73d983a30b1fc798860f8af9b5902090e297312c':
Mark Salyzyn [Thu, 27 Aug 2015 05:12:49 +0000 (05:12 +0000)]
am
56c6da78: (-s ours) am
eb7718b1: am
5b7e9dc7: Merge "dumpstate: add logcat -b all -S"
* commit '
56c6da786ae4937fdc99862e1de3b93ecd4fc988':
Dan Stoza [Thu, 27 Aug 2015 05:12:47 +0000 (05:12 +0000)]
am
dc54ab50: (-s ours) am
d87defaf: SF: Allow present if sideband stream changed
* commit '
dc54ab507c4779a856c09b62475d9287f50d6a40':
Yasuhiro Matsuda [Thu, 27 Aug 2015 05:12:46 +0000 (05:12 +0000)]
am
d0cbde8e: (-s ours) am
607b913e: am
366c38f8: Merge "Enable atrace to read categories from file."
* commit '
d0cbde8e944d2578d7fd74d634a7d173df5c3403':
Narayan Kamath [Thu, 27 Aug 2015 05:12:42 +0000 (05:12 +0000)]
am
901367bf: (-s ours) am
a29db50c: Merge "Revert "Bug fix in SensorManager."" into mnc-dev
* commit '
901367bf66472aa250e48db0492deedd6239f28c':
Aravind Akella [Thu, 27 Aug 2015 05:12:36 +0000 (05:12 +0000)]
am
d9d1fd5b: (-s ours) am
2376bd68: Merge "Bug fix in SensorManager." into mnc-dev
* commit '
d9d1fd5be27bab1ea6d447c15362638bb9feaf79':
Nick Kralevich [Thu, 27 Aug 2015 05:12:35 +0000 (05:12 +0000)]
am
4aec0446: (-s ours) am
ed32594d: am
2cb9994c: Merge "dumpstate: remove unnecessary mkdir"
* commit '
4aec04465c3e3a775f2b7ba34218535af8eb5c2f':
Jim Miller [Thu, 27 Aug 2015 05:12:33 +0000 (05:12 +0000)]
am
71fb8d62: (-s ours) am
bf7cd01a: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature list" into mnc-dev
* commit '
71fb8d622216298b67bfe15349e7189d43b6522c':
Chenjie Luo [Thu, 27 Aug 2015 05:12:31 +0000 (05:12 +0000)]
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 '
4468d325e0f0519b61a31c29fea56085418bc536':
Qiwen Zhao [Thu, 27 Aug 2015 05:12:29 +0000 (05:12 +0000)]
am
61fc4c8b: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at
f892f91.
* commit '
61fc4c8b5a4f877a60b104ed9f9dc2e6a76ee8f8':
Ruchi Kandoi [Wed, 26 Aug 2015 15:47:46 +0000 (15:47 +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 [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>
Aravind Akella [Tue, 25 Aug 2015 19:19:17 +0000 (19:19 +0000)]
am
ba3f1a27: am
4baa69dd: am
8f35ca97: SensorManager fixes.
* commit '
ba3f1a27a245cf22dbaef0dc20e91329f895985e':
SensorManager fixes.
Aravind Akella [Tue, 25 Aug 2015 19:12:28 +0000 (19:12 +0000)]
am
4baa69dd: am
8f35ca97: SensorManager fixes.
* commit '
4baa69ddd25296ee40e84c230af88d1fc7e229a7':
SensorManager fixes.
Aravind Akella [Tue, 25 Aug 2015 19:06:52 +0000 (19:06 +0000)]
am
8f35ca97: SensorManager fixes.
* commit '
8f35ca973063e1449c5ec40b618393187a47ec58':
SensorManager fixes.
Aravind Akella [Mon, 17 Aug 2015 22:22:12 +0000 (15:22 -0700)]
SensorManager fixes.
i) Use pingBinder() to check the status of sensorservice everytime an
event_queue is created. Retry to establish the binder connection if
SensorService has recovered from a runtime restart.
ii) LOG_ALWAYS_FATAL_IF getService(SensorService) returns NULL or malloc
returns NULL.
Bug:
22634472
Change-Id: I4e3912839b6f4114be1a124510878774dbd576a4
Jesse Hall [Sat, 22 Aug 2015 02:56:19 +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: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:24:25 +0000 (18:24 +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 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:17:26 +0000 (01:17 +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:22:21 +0000 (21:22 +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: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
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
Riley Andrews [Wed, 12 Aug 2015 23:51:20 +0000 (23:51 +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: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:28:34 +0000 (23:28 +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 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:50:50 +0000 (23:50 +0000)]
am
d939c967: am
df1bc670: resolved conflicts for merge of
d213f5e7 to cw-e-dev
* commit '
d939c9671200b4bef4cb231c3a95bceea46d6e63':
dumpstate: add logcat -b all -S
Mark Salyzyn [Tue, 11 Aug 2015 23:44:46 +0000 (23:44 +0000)]
am
df1bc670: resolved conflicts for merge of
d213f5e7 to cw-e-dev
* commit '
df1bc67019f4eda8acfd4b97d4c4fd98b55edcb8':
dumpstate: add logcat -b all -S
Mark Salyzyn [Tue, 11 Aug 2015 23:27:05 +0000 (16:27 -0700)]
resolved conflicts for merge of
d213f5e7 to cw-e-dev
Change-Id: Iaea0fdd483b4d0988df442f9b291b99943009829
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 [Tue, 11 Aug 2015 23:15:47 +0000 (23:15 +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:59 +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: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 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 18:15:36 +0000 (18:15 +0000)]
am
e14f71ef: am
18108fd6: am
1362ec74: Merge commit \'
62ec2dd5\' into mm
* commit '
e14f71efd4dfef794fb347363cd0a700d3a6220e':
DO NOT MERGE Add new media navigation keys.
Michael Wright [Fri, 7 Aug 2015 18:07:08 +0000 (18:07 +0000)]
am
18108fd6: am
1362ec74: Merge commit \'
62ec2dd5\' into mm
* commit '
18108fd6837fffff1b7c1db418d44bc7644911f1':
DO NOT MERGE Add new media navigation keys.
Michael Wright [Fri, 7 Aug 2015 18:00:55 +0000 (18:00 +0000)]
am
1362ec74: Merge commit \'
62ec2dd5\' into mm
* commit '
1362ec74fc4f1dc223c9c322f8f49c966ba67594':
DO NOT MERGE Add new media navigation keys.
Michael Wright [Fri, 7 Aug 2015 17:12:20 +0000 (18:12 +0100)]
Merge commit '
62ec2dd5' into mm
Change-Id: I34801df36735545fc500486209573ed2864a0430
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
Dan Stoza [Wed, 5 Aug 2015 19:07:24 +0000 (19:07 +0000)]
am
2121b937: am
04eeb288: am
50be1df7: Merge "SF: Track missed frames and optionally drop them" into mnc-dr-dev
* commit '
2121b93725bb1eb3e2bae79d645d59009c8df259':
SF: Track missed frames and optionally drop them
Dan Stoza [Wed, 5 Aug 2015 19:02:53 +0000 (19:02 +0000)]
am
04eeb288: am
50be1df7: Merge "SF: Track missed frames and optionally drop them" into mnc-dr-dev
* commit '
04eeb2882567412cdcec5981b50c9e7c024b03cc':
SF: Track missed frames and optionally drop them
Dan Stoza [Wed, 5 Aug 2015 18:55:39 +0000 (18:55 +0000)]
am
50be1df7: Merge "SF: Track missed frames and optionally drop them" into mnc-dr-dev
* commit '
50be1df76e2c84fc3c893ec3d3e51ba427dd3ee6':
SF: Track missed frames and optionally drop them
Dan Stoza [Wed, 5 Aug 2015 18:48:10 +0000 (18:48 +0000)]
Merge "SF: Track missed frames and optionally drop them" into mnc-dr-dev
Todd Kennedy [Mon, 3 Aug 2015 19:33:08 +0000 (19:33 +0000)]
am
f3486868: am
2bb9861d: Merge "Add a trace constant for PackageManager"
* commit '
f3486868a80b1e0619738b6200142b8cb9742679':
Add a trace constant for PackageManager
Andreas Gampe [Mon, 3 Aug 2015 19:32:51 +0000 (19:32 +0000)]
am
9079207a: am
dfd082b9: Merge "Native/opengl: Remove unused variables from test"
* commit '
9079207a14e097be2242692f3d68b2c340ad194a':
Native/opengl: Remove unused variables from test
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
Mark Salyzyn [Mon, 3 Aug 2015 17:47:13 +0000 (10:47 -0700)]
resolved conflicts for merge of
eb7718b1 to mnc-dr-dev-plus-aosp
Change-Id: I28e749b040fc97e36f73d11c0f2e8ca487d5b158
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"