Commit Graph

53247 Commits

Author SHA1 Message Date
The Android Automerger 38e32c9d60 merge in mnc-release history after reset to mnc-dev 2015-07-21 01:05:56 -07:00
The Android Automerger 58d353a15d merge in mnc-dr-release history after reset to mnc-dr-dev 2015-07-21 01:03:17 -07:00
Lajos Molnar a6364e257d 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
2015-07-21 00:37:21 +00:00
Aravind Akella f504789dd3 Check for the presence of accel and magnetometer sensors before adding AOSP fusion sensors.
Bug: 22502485
Change-Id: I3d9018649302b98004e4e216b2173e8411a08501
2015-07-20 17:32:09 -07:00
Lajos Molnar f892f91417 Merge "omx: fix structure sizes to be the same on 32 and 64-bit builds" into mnc-dev 2015-07-21 00:22:19 +00:00
Lajos Molnar abaaf70129 omx: fix structure sizes to be the same on 32 and 64-bit builds
Bug: 22512621
Change-Id: I2100b8aad0a1cf110936f4a765718ba97f3d8ce7
2015-07-21 00:19:04 +00:00
Jeff Sharkey 9ca52e34f7 am a2307aef: Only restorecon_data once for all users.
* commit 'a2307aefd06f1310660ef1d35ce01bcfc72c9633':
  Only restorecon_data once for all users.
2015-07-20 23:56:41 +00:00
Jeff Sharkey a2307aefd0 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
2015-07-20 16:26:22 -07:00
The Android Automerger 5526b6edde merge in mnc-dr-release history after reset to mnc-dr-dev 2015-07-18 18:45:37 -07:00
The Android Automerger 2c907cfb5c merge in mnc-release history after reset to mnc-dev 2015-07-18 01:04:21 -07:00
Lajos Molnar 59d6f2c322 am 5f920c1a: BufferQueueConsumer: signal onFrameReleased on dropped frames
* commit '5f920c1a2cf12c0638c05fbddee8ff6c1193731c':
  BufferQueueConsumer: signal onFrameReleased on dropped frames
2015-07-17 18:39:25 +00:00
Lajos Molnar 5f920c1a2c BufferQueueConsumer: signal onFrameReleased on dropped frames
Bug: 22552826
Change-Id: I9bdfeb8c68f403301af90d4b494f0ae7166a767c
2015-07-17 08:37:47 -07:00
Andreas Gampe a0abdab2fe am c968c017: Installd: Add a swap override flag
* commit 'c968c0175e967e39e72f557b5e014b9575ba4727':
  Installd: Add a swap override flag
2015-07-17 01:03:24 +00:00
Andreas Gampe c968c0175e Installd: Add a swap override flag
Add dalvik.vm.dex2oat-swap system property to override a default
decision.

Bug: 20658562
Change-Id: I34368c6e435d1a9ceec20a0bf1c8c6213e527f5e
2015-07-16 15:55:41 -07:00
The Android Automerger 348286159f merge in mnc-release history after reset to mnc-dev 2015-07-15 01:04:39 -07:00
The Android Automerger 2061378ccb merge in mnc-dr-release history after reset to mnc-dr-dev 2015-07-15 01:03:08 -07:00
Adrian Roos 31e138db15 Merge "Show charging speed on Keyguard" into mnc-dr-dev 2015-07-14 19:17:11 +00:00
Michael Wright 82c4163ef5 am fd549578: Merge "Cancel touches as well as pointer gestures." into mnc-dev
* commit 'fd54957888a2fd692e1a8590d7e9e98e4da9ca4d':
  Cancel touches as well as pointer gestures.
2015-07-14 14:39:07 +00:00
Michael Wright fd54957888 Merge "Cancel touches as well as pointer gestures." into mnc-dev 2015-07-14 14:22:38 +00:00
The Android Automerger d64164dfc8 merge in mnc-release history after reset to mnc-dev 2015-07-14 01:06:35 -07:00
The Android Automerger d0ac3c6b4e merge in mnc-dr-release history after reset to mnc-dr-dev 2015-07-14 01:03:24 -07:00
Aravind Akella a4864d61dc am 4904821b: Merge "Rename wakelock held internally by SensorService." into mnc-dev
* commit '4904821b212a3ee91f22a51295f86f6339cbcc8d':
  Rename wakelock held internally by SensorService.
2015-07-13 23:02:20 +00:00
Aravind Akella 4904821b21 Merge "Rename wakelock held internally by SensorService." into mnc-dev 2015-07-13 18:21:49 +00:00
Michael Wright a44766cf0e Cancel touches as well as pointer gestures.
Bug: 19264992
Change-Id: If48e0953b972c9d69f516906adf7c6faf67e3eb8
2015-07-13 09:44:02 +01:00
The Android Automerger fd92b5dfea merge in mnc-dr-release history after reset to mnc-dr-dev 2015-07-11 01:02:36 -07:00
Adrian Roos 687aa22c92 Show charging speed on Keyguard
Bug: 8099739
Change-Id: I2e5c21dd7ec028ce47fb03ab71e74f7fccaa9e36
2015-07-10 13:10:13 -07:00
Aravind Akella 8ef3c89eb2 Rename wakelock held internally by SensorService.
Bug: 22076400
Change-Id: I62129549b0681f200f40da01f53140245309ed88
2015-07-10 11:45:32 -07:00
Qiwen Zhao 3f8fbfdb9b am 982719b1: (-s ours) DO NOT MERGE ANYWHERE. reset back to 570052f with history.
* commit '982719b179aecc33aa6c258318fcbf6e4faa81d7':
2015-07-10 01:43:07 +00:00
Qiwen Zhao 982719b179 DO NOT MERGE ANYWHERE. reset back to 570052f with history. 2015-07-09 17:39:23 -07:00
Michael Wright f37143d8a5 Merge "Cancel touches as well as pointer gestures." into mnc-dev 2015-07-09 21:56:21 +00:00
Michael Wright fbbaf2efbb Cancel touches as well as pointer gestures.
Bug: 19264992
Change-Id: Idbe964a1a35c190a32f845e2a19542d54652d011
2015-07-09 12:43:21 -07:00
The Android Automerger 983c6e1d95 merge in mnc-release history after reset to mnc-dev 2015-07-08 01:04:40 -07:00
The Android Automerger 83265b58b8 merge in mnc-dr-release history after reset to mnc-dr-dev 2015-07-08 01:02:17 -07:00
Jeff Sharkey 570052f777 Merge "Split app move into separate copy/delete steps." into mnc-dev 2015-07-07 20:46:34 +00:00
Jeff Sharkey 31f08986f8 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
2015-07-07 13:31:53 -07:00
The Android Automerger 8f25c94fa3 merge in mnc-release history after reset to mnc-dev 2015-07-07 01:05:37 -07:00
The Android Automerger 16beb863ff merge in mnc-dr-release history after reset to mnc-dr-dev 2015-07-06 16:05:17 -07:00
Dan Stoza 0eb2d39866 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
2015-07-06 13:15:25 -07:00
Jesse Hall 56105b2f72 Merge "Implement a number of KHR EGL extensions" into mnc-dev 2015-07-06 16:09:35 +00:00
Christopher Tate 35f38e42c6 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
2015-07-02 03:28:47 +00:00
Christopher Tate 990c54485f 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
2015-07-02 02:57:06 +00:00
Christopher Tate 35851e2abb 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
2015-07-02 02:45:16 +00:00
Christopher Tate 38ff2b44ad am c1d8af50: am 3a9b9aec: am dc3d6af9: am bb686c25: Disregard alleged binder entities beyond parcel bounds
* commit 'c1d8af50c314164c0e6760d364b47d16b8d423ee':
  Disregard alleged binder entities beyond parcel bounds
2015-07-02 02:33:03 +00:00
Christopher Tate 2b6109523d 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
2015-07-02 02:26:52 +00:00
Christopher Tate 8bd860c3dc am 110654ae: am 8e44d0a1: am 0804ed8e: am 1b8a2f82: Disregard alleged binder entities beyond parcel bounds
* commit '110654ae44e45b1afd5badd24ada96cb9018bed1':
  Disregard alleged binder entities beyond parcel bounds
2015-07-02 02:18:21 +00:00
Christopher Tate 356f7ed3af am 134fd91b: am 708b42e0: am eba7afcc: am 2f340be3: Disregard alleged binder entities beyond parcel bounds
* commit '134fd91bccde911bf9497f09841ec9922bbefec9':
  Disregard alleged binder entities beyond parcel bounds
2015-07-02 02:14:46 +00:00
Christopher Tate c1d8af50c3 am 3a9b9aec: am dc3d6af9: am bb686c25: Disregard alleged binder entities beyond parcel bounds
* commit '3a9b9aec7a0c04b74a278be5773fcfdaa2a04f4e':
  Disregard alleged binder entities beyond parcel bounds
2015-07-02 02:07:24 +00:00
Christopher Tate 110654ae44 am 8e44d0a1: am 0804ed8e: am 1b8a2f82: Disregard alleged binder entities beyond parcel bounds
* commit '8e44d0a173d1f0ec4075778791c88dc392f3981e':
  Disregard alleged binder entities beyond parcel bounds
2015-07-02 02:06:40 +00:00
Christopher Tate 8e44d0a173 am 0804ed8e: am 1b8a2f82: Disregard alleged binder entities beyond parcel bounds
* commit '0804ed8e604f2c4304fa7be3a84f429f770221bf':
  Disregard alleged binder entities beyond parcel bounds
2015-07-02 01:55:53 +00:00
Christopher Tate 134fd91bcc am 708b42e0: am eba7afcc: am 2f340be3: Disregard alleged binder entities beyond parcel bounds
* commit '708b42e0ee5ad97b8426a6245f73131ddfc59a33':
  Disregard alleged binder entities beyond parcel bounds
2015-07-02 01:55:43 +00:00