OSDN Git Service
Adrian Roos [Thu, 22 Oct 2015 23:46:12 +0000 (16:46 -0700)]
Maintain Parcel ABI
Makes sure we don't change the memory layout of the Parcel class
to maintain binary compatibility with prebuilts linking against
libbinder.
Bug:
25004154
Change-Id: I656687497f08bb85cefda796aafa2341e601e30a
Adrian Roos [Thu, 22 Oct 2015 23:12:53 +0000 (16:12 -0700)]
Revert "Revert "Track ashmem memory usage in Parcel""
This reverts commit
6880307e8e35a6c484942443fb4ddd6173126152.
Bug:
25004154
Change-Id: I9b432d1ebc39f3bbcd7afdefc403f0fb6ced8158
Ian Pedowitz [Thu, 22 Oct 2015 22:08:10 +0000 (22:08 +0000)]
Revert "Track ashmem memory usage in Parcel"
This reverts commit
e2f499fb734bc30a1e1c947112caa0727349b6ed.
Bug:
25169267
Bug:
25191602
Bug:
25004154
Change-Id: I24bb0da4e8739ee5a0c251e4adac9904827144e0
Adrian Roos [Wed, 21 Oct 2015 02:11:23 +0000 (19:11 -0700)]
Track ashmem memory usage in Parcel
Bug:
25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc
Naveen Leekha [Tue, 20 Oct 2015 17:02:33 +0000 (17:02 +0000)]
am
18165848: am
e2c4f4fb: am
c1e6fbb5: Initialize local variables to avoid data leak am:
7534e4e63a -s ours am:
7b4863f606
am:
8121177b5e
* commit '
8121177b5e8c406570f0eaf6593c6fd1db232ddf':
Initialize local variables to avoid data leak
Naveen Leekha [Tue, 20 Oct 2015 16:54:09 +0000 (16:54 +0000)]
am
18165848: am
e2c4f4fb: am
c1e6fbb5: Initialize local variables to avoid data leak am:
7534e4e63a -s ours
am:
7b4863f606
* commit '
7b4863f606bdb48b188b0235447dfaba6c8c3cf0':
Initialize local variables to avoid data leak
Naveen Leekha [Tue, 20 Oct 2015 16:42:34 +0000 (16:42 +0000)]
am
18165848: am
e2c4f4fb: am
c1e6fbb5: Initialize local variables to avoid data leak
am:
7534e4e63a -s ours
* commit '
7534e4e63afedeb826a8d8a4b0cf3f9d40d243ea':
Initialize local variables to avoid data leak
Aravind Akella [Wed, 14 Oct 2015 21:03:07 +0000 (21:03 +0000)]
Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-dev
Jesse Hall [Wed, 14 Oct 2015 18:10:24 +0000 (11:10 -0700)]
egl: Remove window disconnect before calling driver eglDestroySurface
This was originally added for b/
14445579. An in-development app was
attempting to render to a window as an EGLSurface, then tear that
down, change some window properties, and create a new EGLSurface. The
second eglCreateWindowSurface failed because the window was already
connected. This change went in, but it turned out the real problem was
that the app still (unintentionally) had the surface current. After
the app bug was fixed, nobody revisited whether this change was
actually needed.
Turns out it wasn't needed. After an EGLSurface is both destroyed
*AND* not current (basically refcount==0), we were already
disconnecting the window in ~egl_surface_t().
Apart from being unnecessary and redundant, disconnecting the window
here is wrong for two reasons:
(a) The surface may still be in use after eglDestroySurface, if it was
still current. Rendering is undefined in that case, but disconnecting
the window leads to more catastrophic results than necessary.
(b) It's being called before calling the driver's eglDestroySurface.
The driver will almost definitely have a buffer dequeued that it needs
to cancel, and by disconnecting first we turn that into an error that
they don't have a graceful way to deal with.
Bug:
24524053
Change-Id: Ib063134413d25d3526f794aafb5e333e3417ea42
Adam Lesinski [Mon, 12 Oct 2015 22:15:50 +0000 (22:15 +0000)]
Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev
Flanker [Mon, 7 Sep 2015 07:28:58 +0000 (15:28 +0800)]
add number constraint for samples per MotionEvent
Bug:
23905002
Change-Id: Ifd24802977c3dcdd1dbc5120a78aac41beae4603
Signed-off-by: Adam Lesinski <adamlesinski@google.com>
Puneet Kumar [Thu, 8 Oct 2015 08:16:58 +0000 (08:16 +0000)]
Merge "Inputflinger: hook up key event replacement processing" into mnc-dr-dev
Puneet Kumar [Thu, 8 Oct 2015 08:16:31 +0000 (08:16 +0000)]
Merge "Allow defining replacement key events in keymap" into mnc-dr-dev
Andrew de los Reyes [Thu, 1 Oct 2015 22:57:25 +0000 (15:57 -0700)]
InputResampling: Don't extrapolate for very low frame rates.
In very low framerate situations, extrapolation is generally going to
either cause no benefit or make a mistake. We can safely turn it off
with no user-visible negative impact.
BUG=https://buganizer.corp.google.com/u/0/issues/
24550942
TEST=Scrolled very slowly and saw mispredictions on Angler. With change,
saw the log message that the mispredictions were suppressed.
Change-Id: Ic9747d3ff098d7918047ada2ed1c2d21282c65b0
Dmitry Torokhov [Thu, 24 Sep 2015 20:13:55 +0000 (13:13 -0700)]
Inputflinger: hook up key event replacement processing
Add handling of "replacement" key events in InputReader and EventHub by
consulting device's character key map (if exists) for presence of
replacement key code for given get code and meta state combination,
before passing it to InputDispatcher.
This enables defining special keys, such as ESC, on keyboards lacking
enough physical keys, via combination of normal keys and modifiers, for
example AltR + 1 => ESC.
Bug:
24504154
Change-Id: I7e36104808bedcf724436c1fbb63d37c35cca8af
Dmitry Torokhov [Fri, 18 Sep 2015 01:04:50 +0000 (18:04 -0700)]
Allow defining replacement key events in keymap
Currently keyboard maps allow to assign character sequences to key
events and allow specifying a so-called "fallback" key events that are
re-injected into input stream if target application indicates that it
was not able to handle the original key event. Unfortunately there is no
way to perform substitution before handing the event to applicationis.
This change adds a new keymap keyword "replace" that allows users query
"replacement" actions for key (if any), with the intent that such
replacement happens early in the event handling process.
Bug:
24504154
Change-Id: I3e6a2476c856524171df00ad22ff56f2018c1278
Naveen Leekha [Thu, 24 Sep 2015 23:35:41 +0000 (23:35 +0000)]
am
69412a51: am
c4bd7211: resolved conflicts for
7534e4e6 to lmp-mr1-ub-dev
* commit '
69412a51f58fa9450f1cb077c8d4b6410128d993':
resolved conflicts for
7534e4e6 to lmp-mr1-ub-dev
Naveen Leekha [Thu, 24 Sep 2015 23:27:31 +0000 (23:27 +0000)]
am
c4bd7211: resolved conflicts for
7534e4e6 to lmp-mr1-ub-dev
* commit '
c4bd7211373cf5b745c7d4f849f43f7a2d2b1141':
resolved conflicts for
7534e4e6 to lmp-mr1-ub-dev
Naveen Leekha [Thu, 24 Sep 2015 22:55:21 +0000 (15:55 -0700)]
resolved conflicts for
7534e4e6 to lmp-mr1-ub-dev
Change-Id: I543df164076b44578b14d41031800bb62b81586d
Naveen Leekha [Thu, 24 Sep 2015 22:26:22 +0000 (22:26 +0000)]
am
571e27e2: am
e889592e: am
73887c08: am
b414255f: Initialize local variables to avoid data leak
* commit '
571e27e20e30560985d7c3a3ba8885693695b0fc':
Initialize local variables to avoid data leak
Naveen Leekha [Thu, 24 Sep 2015 22:20:59 +0000 (22:20 +0000)]
am
e889592e: am
73887c08: am
b414255f: Initialize local variables to avoid data leak
* commit '
e889592e33891c9b88ff6ba655426118f8ef12ee':
Initialize local variables to avoid data leak
Naveen Leekha [Thu, 24 Sep 2015 22:20:05 +0000 (22:20 +0000)]
am
18165848: am
e2c4f4fb: am
c1e6fbb5: Initialize local variables to avoid data leak
* commit '
18165848e86feab8656bfdac3173bccf45a9a6df':
Initialize local variables to avoid data leak
Naveen Leekha [Thu, 24 Sep 2015 22:13:06 +0000 (22:13 +0000)]
am
73887c08: am
b414255f: Initialize local variables to avoid data leak
* commit '
73887c0864c9a928db6f66bd48c5aea4d31d9a8b':
Initialize local variables to avoid data leak
Naveen Leekha [Thu, 24 Sep 2015 22:04:48 +0000 (22:04 +0000)]
am
e2c4f4fb: am
c1e6fbb5: Initialize local variables to avoid data leak
* commit '
e2c4f4fb8b34e36a4f2760f3812c942604cabfb6':
Initialize local variables to avoid data leak
Naveen Leekha [Thu, 24 Sep 2015 22:00:33 +0000 (22:00 +0000)]
am
b414255f: Initialize local variables to avoid data leak
* commit '
b414255f53b560a06e642251535b019327ba0d7b':
Initialize local variables to avoid data leak
Naveen Leekha [Thu, 24 Sep 2015 22:00:13 +0000 (22:00 +0000)]
am
c1e6fbb5: Initialize local variables to avoid data leak
* commit '
c1e6fbb52c3f85cc7610d1d07d12be38f70b4ed4':
Initialize local variables to avoid data leak
Michael Wright [Wed, 23 Sep 2015 13:18:26 +0000 (13:18 +0000)]
Merge "DO NOT MERGE Cancel touches as well as pointer gestures." into mnc-dr-dev
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
Naveen Leekha [Wed, 23 Sep 2015 01:04:44 +0000 (18:04 -0700)]
Initialize local variables to avoid data leak
The uninitialized local variables pick up
whatever the memory content was there on stack.
This data gets sent to the remote process in
case of a failed transaction, which is a security
issue. Fixed.
(Partial manual merge of master change
12ba0f57d028a9c8f4eb3afddc326b70677d1e0c. Rest
to automerge from klp-dev)
For b/
23696300
Change-Id: I704c9fab327b3545c58e8a9a96ac542eb7469c2a
Naveen Leekha [Wed, 23 Sep 2015 00:58:21 +0000 (17:58 -0700)]
Initialize local variables to avoid data leak
The uninitialized local variables pick up
whatever the memory content was there on stack.
This data gets sent to the remote process in
case of a failed transaction, which is a security
issue. Fixed.
(Manual merge of master change
12ba0f57d028a9c8f4eb3afddc326b70677d1e0c )
For b/
23696300
Change-Id: I665212d10da56f0803b5bb772d14c77e632ba2ab
Michael Wright [Mon, 22 Jun 2015 15:18:21 +0000 (16:18 +0100)]
DO NOT MERGE Cancel touches as well as pointer gestures.
Bug:
24302031
Change-Id: Idbe964a1a35c190a32f845e2a19542d54652d011
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 [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
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
Aravind Akella [Thu, 10 Sep 2015 21:52:31 +0000 (14:52 -0700)]
Set DATA_INJECTION mode flag for sensors.
Bug:
24001171
Change-Id: I70133546c68fb478b2c2062f05a4164a36cd9e4b
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
Martijn Coenen [Mon, 7 Sep 2015 07:25:51 +0000 (07:25 +0000)]
Merge "Map realtime to clock_monotonic." into mnc-dr-dev
Dan Stoza [Thu, 3 Sep 2015 21:55:36 +0000 (21:55 +0000)]
Merge "SF: Add colorTransform to DisplayInfo" into mnc-dr-dev
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
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
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
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
Glenn Kasten [Fri, 28 Aug 2015 03:09:39 +0000 (20:09 -0700)]
Add XML for pro audio feature
Bug:
23604253
Change-Id: I480cf0a46c286badc6fd95a3b42e6cb1ed056b1b
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
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
Michael Wright [Fri, 7 Aug 2015 17:12:20 +0000 (18:12 +0100)]
Merge commit '
62ec2dd5' into mm
Change-Id: I34801df36735545fc500486209573ed2864a0430
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 18:48:10 +0000 (18:48 +0000)]
Merge "SF: Track missed frames and optionally drop them" into mnc-dr-dev
Naveen Leekha [Mon, 3 Aug 2015 14:51:31 +0000 (14:51 +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
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:52 +0000 (15:44 +0000)]
am
d87defaf: SF: Allow present if sideband stream changed
* commit '
d87defaf486ff4e9c0066754564851cfb7be49ed':
SF: Allow present if sideband stream changed
Aravind Akella [Thu, 30 Jul 2015 01:03:48 +0000 (18:03 -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: I3c506d962b61347085fc80b2c5832289539d6853
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:07:56 +0000 (10:07 +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:40:49 +0000 (00:40 +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
Jim Miller [Fri, 24 Jul 2015 02:53:59 +0000 (02:53 +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
Dan Stoza [Thu, 9 Jul 2015 19:43:33 +0000 (12:43 -0700)]
SF: Track missed frames and optionally drop them
Adds code to track whether SurfaceFlinger has sent two frames to HWC in
the same vsync window. This can occur if one frame is delayed so far
it slips into the next window or just if one frame takes an abnormal
amount of time. If this occurs, it shows up as FrameMissed in systrace.
Also adds a property debug.sf.drop_missed_frames which, if set, tells
SurfaceFlinger to skip sending a frame to HWC (i.e., calling
prepare/set) when we detect this condition, which can help prevent
backpressure from the HWC implementation.
Bug:
22513558
Change-Id: I2df0d44cec5fd6edba419388d8c90b5710d1a5b6
Chenjie Luo [Wed, 22 Jul 2015 20:23:43 +0000 (20:23 +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
Lajos Molnar [Tue, 21 Jul 2015 00:37:21 +0000 (00:37 +0000)]
am
f892f914: Merge "omx: fix structure sizes to be the same on 32 and 64-bit builds" into mnc-dev
* commit '
f892f9141721a3805d18da2db0e1c17f1a99feb0':
omx: fix structure sizes to be the same on 32 and 64-bit builds
Aravind Akella [Tue, 21 Jul 2015 00:29:33 +0000 (17:29 -0700)]
Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors.
Bug:
22502485
Change-Id: I3d9018649302b98004e4e216b2173e8411a08501
Lajos Molnar [Tue, 21 Jul 2015 00:22:18 +0000 (00:22 +0000)]
Merge "omx: fix structure sizes to be the same on 32 and 64-bit builds" into mnc-dev
Lajos Molnar [Mon, 20 Jul 2015 22:29:24 +0000 (15:29 -0700)]
omx: fix structure sizes to be the same on 32 and 64-bit builds
Bug:
22512621
Change-Id: I2100b8aad0a1cf110936f4a765718ba97f3d8ce7
Jeff Sharkey [Mon, 20 Jul 2015 23:56:41 +0000 (23:56 +0000)]
am
a2307aef: Only restorecon_data once for all users.
* commit '
a2307aefd06f1310660ef1d35ce01bcfc72c9633':
Only restorecon_data once for all users.
Jeff Sharkey [Mon, 20 Jul 2015 23:26:19 +0000 (16:26 -0700)]
Only restorecon_data once for all users.
restorecon_data already iterates across all found users internally,
so we don't need to call it for each UID moved. In fact, this was a
bug that caused data for the owner to be relabeled when moving apps
back to internal storage.
Bug:
21813384
Change-Id: I5ba76d4f30d129365864c8a25b665f344b99a6b4
Lajos Molnar [Fri, 17 Jul 2015 18:39:25 +0000 (18:39 +0000)]
am
5f920c1a: BufferQueueConsumer: signal onFrameReleased on dropped frames
* commit '
5f920c1a2cf12c0638c05fbddee8ff6c1193731c':
BufferQueueConsumer: signal onFrameReleased on dropped frames
Lajos Molnar [Mon, 13 Jul 2015 23:04:24 +0000 (16:04 -0700)]
BufferQueueConsumer: signal onFrameReleased on dropped frames
Bug:
22552826
Change-Id: I9bdfeb8c68f403301af90d4b494f0ae7166a767c
Andreas Gampe [Fri, 17 Jul 2015 01:03:24 +0000 (01:03 +0000)]
am
c968c017: Installd: Add a swap override flag
* commit '
c968c0175e967e39e72f557b5e014b9575ba4727':
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
Change-Id: I34368c6e435d1a9ceec20a0bf1c8c6213e527f5e
Adrian Roos [Tue, 14 Jul 2015 19:17:00 +0000 (19:17 +0000)]
Merge "Show charging speed on Keyguard" into mnc-dr-dev
Michael Wright [Tue, 14 Jul 2015 14:39:07 +0000 (14:39 +0000)]
am
fd549578: Merge "Cancel touches as well as pointer gestures." into mnc-dev
* commit '
fd54957888a2fd692e1a8590d7e9e98e4da9ca4d':
Cancel touches as well as pointer gestures.
Michael Wright [Tue, 14 Jul 2015 14:22:36 +0000 (14:22 +0000)]
Merge "Cancel touches as well as pointer gestures." into mnc-dev
Aravind Akella [Mon, 13 Jul 2015 23:02:20 +0000 (23:02 +0000)]
am
4904821b: Merge "Rename wakelock held internally by SensorService." into mnc-dev
* commit '
4904821b212a3ee91f22a51295f86f6339cbcc8d':
Rename wakelock held internally by SensorService.
Aravind Akella [Mon, 13 Jul 2015 18:21:48 +0000 (18:21 +0000)]
Merge "Rename wakelock held internally by SensorService." into mnc-dev
Michael Wright [Mon, 22 Jun 2015 15:18:21 +0000 (16:18 +0100)]
Cancel touches as well as pointer gestures.
Bug:
19264992
Change-Id: If48e0953b972c9d69f516906adf7c6faf67e3eb8
Adrian Roos [Fri, 10 Jul 2015 20:08:28 +0000 (13:08 -0700)]
Show charging speed on Keyguard
Bug:
8099739
Change-Id: I2e5c21dd7ec028ce47fb03ab71e74f7fccaa9e36
Aravind Akella [Fri, 10 Jul 2015 18:24:28 +0000 (11:24 -0700)]
Rename wakelock held internally by SensorService.
Bug:
22076400
Change-Id: I62129549b0681f200f40da01f53140245309ed88
Qiwen Zhao [Fri, 10 Jul 2015 01:43:07 +0000 (01:43 +0000)]
am
982719b1: (-s ours) DO NOT MERGE ANYWHERE. reset back to
570052f with history.
* commit '
982719b179aecc33aa6c258318fcbf6e4faa81d7':
Qiwen Zhao [Fri, 10 Jul 2015 00:39:23 +0000 (17:39 -0700)]
DO NOT MERGE ANYWHERE. reset back to
570052f with history.
Michael Wright [Thu, 9 Jul 2015 21:56:20 +0000 (21:56 +0000)]
Merge "Cancel touches as well as pointer gestures." into mnc-dev
Michael Wright [Mon, 22 Jun 2015 15:18:21 +0000 (16:18 +0100)]
Cancel touches as well as pointer gestures.
Bug:
19264992
Change-Id: Idbe964a1a35c190a32f845e2a19542d54652d011
Jeff Sharkey [Tue, 7 Jul 2015 20:46:32 +0000 (20:46 +0000)]
Merge "Split app move into separate copy/delete steps." into mnc-dev
Jeff Sharkey [Tue, 7 Jul 2015 20:31:37 +0000 (13:31 -0700)]
Split app move into separate copy/delete steps.
App movement now has three distinct stages: copying, scanning, and
cleanup. Previously, a battery pull late in the move process would
end up with packages.xml pointing at the old location which had been
torn down. Now, we update packages.xml to point at the new location
as the "source of truth" before we start deleting the old location.
Bug:
21831336
Change-Id: I62b8916c673265c240e2574ea968cdce5a7a0074
Dan Stoza [Mon, 6 Jul 2015 19:56:50 +0000 (12:56 -0700)]
SF: Ignore PTS more than one second in the future
Some of this logic already existed, but when we optimized
SurfaceFlinger to avoid unnecessary wake-ups, we didn't carry the logic
over into the new readiness test. shouldPresentNow now returns true if
the timestamp is more than a second in the future (since it's likely a
bogus timestamp and should be ignored).
Bug:
21932760
Change-Id: Ib50970a4eb621588c0b60766c8d8d1a8bddf853b
Jesse Hall [Mon, 6 Jul 2015 16:09:33 +0000 (16:09 +0000)]
Merge "Implement a number of KHR EGL extensions" into mnc-dev
Christopher Tate [Thu, 2 Jul 2015 03:28:47 +0000 (03:28 +0000)]
am
990c5448: am
35851e2a: am
38ff2b44: am
c1d8af50: am
3a9b9aec: am
dc3d6af9: am
bb686c25: Disregard alleged binder entities beyond parcel bounds
* commit '
990c54485f361d587d09952e60ab5fb608d161dd':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 02:57:06 +0000 (02:57 +0000)]
am
35851e2a: am
38ff2b44: am
c1d8af50: am
3a9b9aec: am
dc3d6af9: am
bb686c25: Disregard alleged binder entities beyond parcel bounds
* commit '
35851e2abbfe8f1d9c4cc7dc13a6e6e155b61664':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 02:45:16 +0000 (02:45 +0000)]
am
38ff2b44: am
c1d8af50: am
3a9b9aec: am
dc3d6af9: am
bb686c25: Disregard alleged binder entities beyond parcel bounds
* commit '
38ff2b44ad7a64768cd1bb8793ec6c45e8d1e68e':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 02:33:03 +0000 (02:33 +0000)]
am
c1d8af50: am
3a9b9aec: am
dc3d6af9: am
bb686c25: Disregard alleged binder entities beyond parcel bounds
* commit '
c1d8af50c314164c0e6760d364b47d16b8d423ee':
Disregard alleged binder entities beyond parcel bounds
Christopher Tate [Thu, 2 Jul 2015 02:26:52 +0000 (02:26 +0000)]
am
8bd860c3: am
110654ae: am
8e44d0a1: am
0804ed8e: am
1b8a2f82: Disregard alleged binder entities beyond parcel bounds
* commit '
8bd860c3dc2eaac10b6f55c9ec85cae4d172eb26':
Disregard alleged binder entities beyond parcel bounds