OSDN Git Service
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 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 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: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: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 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
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 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
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: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
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
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."
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
Andreas Gampe [Fri, 17 Jul 2015 01:31:13 +0000 (01:31 +0000)]
am
25b2ed03: Merge "Installd: Add a swap override flag"
* commit '
25b2ed03487b7c7b4e5e6897525a169ee32b1998':
Installd: Add a swap override flag
Andreas Gampe [Fri, 17 Jul 2015 01:23:10 +0000 (01:23 +0000)]
Merge "Installd: Add a swap override flag"
Andreas Gampe [Thu, 16 Jul 2015 22:55:41 +0000 (15:55 -0700)]
Installd: Add a swap override flag
Add dalvik.vm.dex2oat-swap system property to override a default
decision.
Bug:
20658562
(cherry picked from commit
c968c0175e967e39e72f557b5e014b9575ba4727)
Change-Id: I34368c6e435d1a9ceec20a0bf1c8c6213e527f5e
Evgenii Stepanov [Wed, 15 Jul 2015 00:02:44 +0000 (00:02 +0000)]
am
5e8dcf1c: Merge "With SANITIZE_TARGET, load EGL libs from the instrumented path."
* commit '
5e8dcf1c1fbd060f1bd2ba8d45bbc228bb310a7e':
With SANITIZE_TARGET, load EGL libs from the instrumented path.
Evgenii Stepanov [Tue, 14 Jul 2015 23:47:59 +0000 (23:47 +0000)]
Merge "With SANITIZE_TARGET, load EGL libs from the instrumented path."
Elliott Hughes [Thu, 9 Jul 2015 17:29:47 +0000 (17:29 +0000)]
am
9bad590e: Merge "Binder on Windows? Unlikely."
* commit '
9bad590ef91c655fb9a0212e5a347aaa3e350bb0':
Binder on Windows? Unlikely.
Elliott Hughes [Thu, 9 Jul 2015 17:16:58 +0000 (17:16 +0000)]
Merge "Binder on Windows? Unlikely."
Elliott Hughes [Thu, 9 Jul 2015 17:04:34 +0000 (10:04 -0700)]
Binder on Windows? Unlikely.
Change-Id: I36c1bee4ed33b9b0d24109a6dbaefa0548dd5aa8
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
Narayan Kamath [Wed, 1 Jul 2015 13:14:41 +0000 (13:14 +0000)]
am
dbc2d87a: Merge "Installd: Fix delete_code_cache() clearing the wrong cache dir"
* commit '
dbc2d87a74987db84f6cb3cf1eed9ae7ca450ce7':
Installd: Fix delete_code_cache() clearing the wrong cache dir
Narayan Kamath [Wed, 1 Jul 2015 13:03:55 +0000 (13:03 +0000)]
Merge "Installd: Fix delete_code_cache() clearing the wrong cache dir"
Hao Li [Thu, 25 Jun 2015 02:31:56 +0000 (14:31 +1200)]
Installd: Fix delete_code_cache() clearing the wrong cache dir
Fix a typo in delete_code_cache() introduced by commit
c03de09, which
causes the function to empty /data/data/<package_name>/cache/ rather
than /data/data/<package_name>/code_cache/.
The following CTS test case should now pass:
com.android.cts.appsecurity.SplitTests#testClearCodeCache
Change-Id: I2d9452d70ed39b3ea29ad65fb35e788c2fef5100
Signed-off-by: Hao Li <hao.i.li@intel.com>
Signed-off-by: Yu Ning <yu.ning@intel.com>
Dan Stoza [Tue, 30 Jun 2015 17:24:40 +0000 (17:24 +0000)]
am
1998615f: Merge "sf: Initialize EventThread before creating HWC"
* commit '
1998615f8b5becc6d2bb309a4a1686fe24c71bbc':
sf: Initialize EventThread before creating HWC
Dan Stoza [Tue, 30 Jun 2015 17:11:08 +0000 (17:11 +0000)]
Merge "sf: Initialize EventThread before creating HWC"
John Reck [Mon, 29 Jun 2015 14:28:45 +0000 (14:28 +0000)]
am
dd749506: Merge "Fix async_stop"
* commit '
dd7495068b9af549d2bb1e3c4f3d91a9a929d3f0':
Fix async_stop
John Reck [Mon, 29 Jun 2015 14:17:43 +0000 (14:17 +0000)]
Merge "Fix async_stop"
John Reck [Fri, 15 May 2015 17:00:34 +0000 (10:00 -0700)]
Fix async_stop
Change-Id: I68a258cf71cfcd999bbd568ab3c96255c11bec41
(cherry picked from commit
2c237ee1d5961b9d11618e0c5a97b3bb7fb694b2)
Yasuhiro Matsuda [Mon, 29 Jun 2015 10:20:39 +0000 (19:20 +0900)]
Enable atrace to read categories from file.
Add -f option to atrace, which enables atrace to use the
categories written in the specified file.
BUG:
21739901
Change-Id: I2cf1f277280434b28c426c68e2864b62aebd20cc
Scott Bauer [Mon, 8 Jun 2015 23:32:36 +0000 (16:32 -0700)]
Tracing for binder locks/transactions
Added logic to pull traces from the binder driver.
Change-Id: I9aa00b4650fc3f90d7bd55328dfef11e2514f7b4
Saurabh Shah [Tue, 16 Jun 2015 00:55:51 +0000 (17:55 -0700)]
sf: Initialize EventThread before creating HWC
Once HWC is created, it could use any of the provided hooks, which
could lead to a crash if the EventThread (handler) isn't initialized
prior to creating HWC.
Change-Id: I5ea35fe9bcb150fb74aae1295b798bd787ad6cee
Mark Salyzyn [Mon, 15 Jun 2015 14:35:49 +0000 (14:35 +0000)]
am
2ab05fc5: Merge "dumpstate: modify logcat timeout to compensate for storage speed"
* commit '
2ab05fc551f8ee8442b05484cce0350c1b523678':
dumpstate: modify logcat timeout to compensate for storage speed
Mark Salyzyn [Mon, 15 Jun 2015 14:27:10 +0000 (14:27 +0000)]
Merge "dumpstate: modify logcat timeout to compensate for storage speed"
Mark Salyzyn [Fri, 12 Jun 2015 19:28:24 +0000 (12:28 -0700)]
dumpstate: modify logcat timeout to compensate for storage speed
Discover the logcat buffer size, divide by the worst storage
speed in kb/s, and multiply by ten to estimate the timeout in
ms for each named buffer. If that value is less than 20 seconds,
then select 20 seconds. Apply this to each logcat request.
Bug:
21555259
Change-Id: Id36aebff83cb06e94350e4a84fa266b66a8444fc
Dan Stoza [Fri, 12 Jun 2015 17:00:44 +0000 (17:00 +0000)]
am
2b5b55e7: Merge "sf: Fix incorrect state reporting in dumpsys"
* commit '
2b5b55e73c79658b9a0ae3fdf347f6dbe65e3c68':
sf: Fix incorrect state reporting in dumpsys
Dan Stoza [Fri, 12 Jun 2015 16:47:21 +0000 (16:47 +0000)]
Merge "sf: Fix incorrect state reporting in dumpsys"
Manoj Kumar AVM [Thu, 11 Jun 2015 21:18:14 +0000 (14:18 -0700)]
sf: Fix incorrect state reporting in dumpsys
Dumpsys utility accesses layer compositionType variable
with out proper protection. These variables are modified
during hwc_prepare call. Existing HAL lock protection is not
sufficient to address this issue. Failure to do this will
result in incorrect state reporting in dumpsys.
A new displayLock mutex in HWComposer will be used in both
dumpsys and draw calls to ensure correct state is accessed.
Change-Id: I8a57de59525adc0e089b3bed95c067c01e42b666
Dan Stoza [Thu, 11 Jun 2015 19:40:31 +0000 (19:40 +0000)]
am
85e271d0: Merge "sf: Add a NULL check in getDisplayConfigs"
* commit '
85e271d051770fdd5bb1bb017255f735cbd45459':
sf: Add a NULL check in getDisplayConfigs
Dan Stoza [Thu, 11 Jun 2015 19:31:43 +0000 (19:31 +0000)]
Merge "sf: Add a NULL check in getDisplayConfigs"
Tatenda Chipeperekwa [Wed, 29 Oct 2014 23:47:19 +0000 (16:47 -0700)]
sf: Add a NULL check in getDisplayConfigs
Validate the display binder by adding a NULL check in getDisplayConfigs.
This will prevent a false match if the caller queries the display
configs for an inactive display (whose binder is NULL by default).
Without this change we might end up attempting to index the display
config array, which is unpopulated for inactive displays, and this will
result in a crash. (See getDisplayInfo in SurfaceComposerClient.cpp for
an example of this scenario)
Change-Id: Ib32a7dc8378d3438df0dba1ecd608bbcfc837717
Dan Stoza [Thu, 11 Jun 2015 17:47:58 +0000 (17:47 +0000)]
am
ffe3e96a: Merge "GLConsumer: Fix crop math"
* commit '
ffe3e96afe99e94904ca0c8f458a3eb708d78066':
GLConsumer: Fix crop math
Dan Stoza [Thu, 11 Jun 2015 17:34:15 +0000 (17:34 +0000)]
Merge "GLConsumer: Fix crop math"
Dan Stoza [Tue, 9 Jun 2015 22:05:23 +0000 (15:05 -0700)]
GLConsumer: Fix crop math
When we have excess pixels that need to be removed from (for example)
the left and right sides, we currently do something like:
left += excess / 2;
right -= excess / 2;
If excess is odd, however, this removes 1 too few pixels since the odd
pixel gets rounded down twice. This changes the math to effectively:
left += excess / 2;
right -= (excess - excess / 2);
Which removes the correct total number of pixels.
Bug:
19611086
Change-Id: I8d1ad9fe7ba67c149794c148663d12acbccccef0
(cherry picked from commit
ec4cb387502d5bd09e49b55605cf679fe3a0207a)
Dan Stoza [Wed, 10 Jun 2015 18:21:55 +0000 (18:21 +0000)]
am
127cf2ef: Merge "SF: Swap w/h when capturing rotated screenshots"
* commit '
127cf2eff638a98c5318ba8b3edaf3ca651c4090':
SF: Swap w/h when capturing rotated screenshots
Dan Stoza [Wed, 10 Jun 2015 18:10:07 +0000 (18:10 +0000)]
Merge "SF: Swap w/h when capturing rotated screenshots"
Dan Stoza [Tue, 9 Jun 2015 23:44:40 +0000 (16:44 -0700)]
SF: Swap w/h when capturing rotated screenshots
Swaps width and height when capturing a screenshot that is rotated by
90 or 270 degrees.
Bug:
8433742
Change-Id: Ibf0b604f541e3cc271e56fe0ad04dc366beb5d79
(cherry picked from commit
3502416204d9dbd905012ee586d8bd145323809f)
Dan Stoza [Tue, 9 Jun 2015 20:40:48 +0000 (20:40 +0000)]
am
5ab3ba1e: Merge "SF: Don\'t crop surface damage against viewport"
* commit '
5ab3ba1e43e609c7a77cc780c888f666d153a4c9':
SF: Don't crop surface damage against viewport
Dan Stoza [Tue, 9 Jun 2015 20:28:59 +0000 (20:28 +0000)]
Merge "SF: Don't crop surface damage against viewport"
Dan Stoza [Fri, 5 Jun 2015 02:40:03 +0000 (19:40 -0700)]
SF: Don't crop surface damage against viewport
Apply the display transform to surface damage, but don't intersect it
with the viewport.
Bug:
21486007
Change-Id: I94e697cea52096a960385d5f3b89609fdcf30a02
(cherry picked from commit
17833a1b0d70cd5cea342cadea9fdbbf16748bc6)
Dan Stoza [Tue, 9 Jun 2015 18:37:09 +0000 (18:37 +0000)]
am
816c9e0e: Merge "libgui/SurfaceFlinger: Add getConsumerName"
* commit '
816c9e0eab939322360da972569506ba19fafc74':
libgui/SurfaceFlinger: Add getConsumerName
Dan Stoza [Tue, 9 Jun 2015 18:37:08 +0000 (18:37 +0000)]
am
b169b49a: Merge "libgui: Add generation numbers to BufferQueue"
* commit '
b169b49aecdbf3424f334ac2b22c36a2988a8338':
libgui: Add generation numbers to BufferQueue
Dan Stoza [Tue, 9 Jun 2015 18:34:10 +0000 (18:34 +0000)]
Merge "libgui/SurfaceFlinger: Add getConsumerName"
Dan Stoza [Mon, 8 Jun 2015 16:32:50 +0000 (09:32 -0700)]
libgui/SurfaceFlinger: Add getConsumerName
Adds a getConsumerName method to IGraphicBufferProducer and Surface.
Currently, the name is cached inside of IGBP and is update on connect
and dequeueBuffer, which should be good enough for most uses.
Bug:
6667401
Change-Id: I22c7881d778e495cf8276de7bbcd769e52429915
(cherry picked from commit
c6f30bdee1f634eb90d68cb76efe935b6535a1e8)
Dan Stoza [Tue, 9 Jun 2015 18:23:48 +0000 (18:23 +0000)]
Merge "libgui: Add generation numbers to BufferQueue"
Dan Stoza [Tue, 2 Jun 2015 22:45:22 +0000 (15:45 -0700)]
libgui: Add generation numbers to BufferQueue
This change allows producers to set a generation number on a
BufferQueue. This number will be embedded in any new GraphicBuffers
created in that BufferQueue, and attempts to attach buffers which have
a different generation number will fail.
It also plumbs the setGenerationNumber method through Surface, with the
additional effect that any buffers attached to the Surface after
setting a new generation number will automatically be updated with the
new number (as opposed to failing, as would happen on through IGBP).
Bug:
20923096
Change-Id: I32bf726b035f99c3e5834beaf76afb9f01adcbc2
(cherry picked from commit
812ed0644f8f8f71ca403f4e5793f0dbc1fcf9b2)
Nick Kralevich [Wed, 3 Jun 2015 13:41:53 +0000 (13:41 +0000)]
am
c19fdee3: Merge "Call selinux_status_open() prior to use of selinux_status_updated()."
* commit '
c19fdee38a4715b0d642fc8673687715766307cc':
Call selinux_status_open() prior to use of selinux_status_updated().
Nick Kralevich [Wed, 3 Jun 2015 13:33:36 +0000 (13:33 +0000)]
Merge "Call selinux_status_open() prior to use of selinux_status_updated()."
Stephen Smalley [Wed, 3 Jun 2015 13:25:37 +0000 (09:25 -0400)]
Call selinux_status_open() prior to use of selinux_status_updated().
The selinux_status_*() interfaces require calling selinux_status_open()
first. Since this was not being called by servicemanager, the
selinux_status_updated() call was always failing and servicemanager
was not reloading service_contexts upon a policy reload.
Change-Id: I6ac62e114bbca99c5f0999feb918fcde15009274
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Dan Stoza [Mon, 1 Jun 2015 22:09:30 +0000 (22:09 +0000)]
am
8980e0cc: Merge "libgui: Propagate error by clearing sp<GB>"
* commit '
8980e0ccd4608adbef0d7c80ead97cec995e269c':
libgui: Propagate error by clearing sp<GB>
Dan Stoza [Mon, 1 Jun 2015 21:59:20 +0000 (21:59 +0000)]
Merge "libgui: Propagate error by clearing sp<GB>"
Dan Stoza [Mon, 1 Jun 2015 20:59:15 +0000 (13:59 -0700)]
libgui: Propagate error by clearing sp<GB>
Clears the sp<GraphicBuffer> returned by createGraphicBuffer when there
is an error during unflattening.
Bug:
21498231
Change-Id: I886da4474fc06853cc59188d62044b7d7549126b
(cherry picked from commit
6a04e5fcf67e754b215301fe38a6401db567f4b5)
Dan Stoza [Mon, 1 Jun 2015 18:42:31 +0000 (18:42 +0000)]
am
cf1edb3f: Merge "Fix libgui crop matrix test."
* commit '
cf1edb3f3ece597dcf9c3f4ae018374550e8b561':
Fix libgui crop matrix test.
Dan Stoza [Mon, 1 Jun 2015 18:31:20 +0000 (18:31 +0000)]
am
75145aa2: Merge "SF: Reduce resync samples without present"
* commit '
75145aa2b77c348bce43c432c17b70f6dcb31c91':
SF: Reduce resync samples without present
Dan Stoza [Mon, 1 Jun 2015 18:31:19 +0000 (18:31 +0000)]
Merge "Fix libgui crop matrix test."
Dan Stoza [Mon, 1 Jun 2015 18:31:19 +0000 (18:31 +0000)]
am
edcfe7c5: Merge "libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc"
* commit '
edcfe7c513a111890b7bd245cf10fa105e910277':
libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc
Dan Stoza [Mon, 1 Jun 2015 18:31:17 +0000 (18:31 +0000)]
am
c76683f5: Merge "Check that width and height parameters are small."
* commit '
c76683f51f6ad1f5493d9af43bf868601f474060':
Check that width and height parameters are small.
Michael Lentine [Fri, 29 May 2015 23:05:36 +0000 (16:05 -0700)]
Fix libgui crop matrix test.
On devices that have the crop image extension the crop is not applied to the
transform matrix so we have to expect different results in this case.
Change-Id: If62dec1111fb77c9fa2c4332d121665960ce0216
(cherry picked from commit
04b00cea67b406c4a971b24b9f91e95c754813ed)
Dan Stoza [Mon, 1 Jun 2015 18:27:35 +0000 (18:27 +0000)]
Merge "SF: Reduce resync samples without present"
Dan Stoza [Fri, 29 May 2015 20:00:23 +0000 (13:00 -0700)]
SF: Reduce resync samples without present
Reduces the number of resync samples that DispSync will attempt to
collect without an intervening present from 12 to 4. The former value
was causing excessive power draw for some vendors' implementations, and
reducing it doesn't seem to harm anything.
Bug:
20724456
Change-Id: Ifd6e0490be67756ed001d509a38e8a36953b4618
(cherry picked from commit
9c64757f6530a0510f15f8bd75b1925a3001f83a)
Dan Stoza [Mon, 1 Jun 2015 18:25:50 +0000 (18:25 +0000)]
Merge "libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc"
Dan Stoza [Fri, 29 May 2015 19:48:04 +0000 (12:48 -0700)]
libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc
Applies GRALLOC_USAGE_ALLOC_MASK to the incoming usage bits before
calling alloc on the gralloc module. This filters out the new flag
GRALLOC_USAGE_FOREIGN_BUFFERS, which is used to send a hint to the
producer, but which does not affect the allocation of buffers.
Bug:
19801661
Change-Id: Ia37a3eddba2e97598e50ac3e10877430adfa9247
(cherry picked from commit
b8efdc40039e4900ae2c64fbdfa03906c867ec84)
Dan Stoza [Mon, 1 Jun 2015 18:18:42 +0000 (18:18 +0000)]
Merge "Check that width and height parameters are small."
Michael Lentine [Fri, 29 May 2015 00:43:06 +0000 (17:43 -0700)]
Check that width and height parameters are small.
The product of width and height should be less than UINT32_MAX (in practice
smaller). Adding the checks prevents overflows when allocating buffers.
Bug:
20726612
Change-Id: I9769edf0688a9bfe69906d49fa0540cadf4c49b0
(cherry picked from commit
1c4537e2e80aa776a61517be8b1605e36432287a)
Dan Stoza [Thu, 28 May 2015 21:40:29 +0000 (21:40 +0000)]
am
a8702c47: Merge "SurfaceFlinger: Tweak whitespace in DdmConnection"
* commit '
a8702c4765993f31a70243e4f89c251fe9911cde':
SurfaceFlinger: Tweak whitespace in DdmConnection