Commit Graph

51299 Commits

Author SHA1 Message Date
Narayan Kamath 5d07648b36 am 26653bad: Fix build.
* commit '26653bad7cdaa09470828781c5a2bab7c4d2445f':
  Fix build.
2014-11-14 10:42:55 +00:00
Narayan Kamath 26653bad7c Fix build.
Remove reference to undefined open max index extension.

Change-Id: I984b91afad3ca4d279a31048b4112fa9afdba9e9
2014-11-14 10:24:28 +00:00
Lajos Molnar c931ca1eec am 1d5d637d: Merge "implement asString() for OMX enumerations used by framework" into lmp-mr1-dev
* commit '1d5d637d6e68bd4965bf0ff9df7b99bc146172f3':
  implement asString() for OMX enumerations used by framework
2014-11-14 10:10:15 +00:00
Lajos Molnar 1d5d637d6e Merge "implement asString() for OMX enumerations used by framework" into lmp-mr1-dev 2014-11-14 10:02:22 +00:00
Dianne Hackborn 1f3ac8b42f am a4cff88d: Fix issue #18356768: some app process may hang at Runtime#exit...
* commit 'a4cff88d80bf1acbdbd063af88ecad83a8b9b7b4':
  Fix issue #18356768: some app process may hang at Runtime#exit...
2014-11-14 01:43:31 +00:00
Dianne Hackborn a4cff88d80 Fix issue #18356768: some app process may hang at Runtime#exit...
...in Parcel destructor

Don't use a Mutux object, just use simple posix mutex primitives,
to avoid static init/destroy order problems.

Change-Id: Ic012d94297564c0a55d58869f8276d7d10545fbc
2014-11-13 17:09:59 -08:00
Ian Rogers 35e5423d4d am 11bf9e5c: Merge "Add support for dalvik.vm.isa.<instruction set>.variant"
* commit '11bf9e5c2f90101d56d918e1b3fe780b873e5566':
  Add support for dalvik.vm.isa.<instruction set>.variant
2014-11-14 00:30:33 +00:00
Ian Rogers 11bf9e5c2f Merge "Add support for dalvik.vm.isa.<instruction set>.variant" 2014-11-14 00:20:52 +00:00
Yabin Cui 007335e688 am bc49cd07: Merge "kill HAVE_FORKEXEC"
* commit 'bc49cd07664d8a590bc6ed44884ba9405f6b706e':
  kill HAVE_FORKEXEC
2014-11-13 23:35:25 +00:00
Yabin Cui bc49cd0766 Merge "kill HAVE_FORKEXEC" 2014-11-13 23:22:27 +00:00
Andreas Gampe d09cf8f10f am 9c17fb19: Merge "Frameworks/native: Wall Werror in batteryservice & powermanager"
* commit '9c17fb191253e9bdc9fc73ba9ff2d590892e5061':
  Frameworks/native: Wall Werror in batteryservice & powermanager
2014-11-13 23:19:37 +00:00
Andreas Gampe 4037c458a7 resolved conflicts for merge of 07dffa18 to lmp-mr1-dev-plus-aosp
Change-Id: I42d8bc291f4f48f3098754b076889159c4b20e41
2014-11-13 15:16:53 -08:00
Andreas Gampe 9c17fb1912 Merge "Frameworks/native: Wall Werror in batteryservice & powermanager" 2014-11-13 22:55:42 +00:00
Andreas Gampe 07dffa184f Merge "Frameworks/native: Wall Werror in surfaceflinger" 2014-11-13 22:33:47 +00:00
Andreas Gampe 347f2884db Frameworks/native: Wall Werror in batteryservice & powermanager
Turn on -Wall -Werror in services/batteryservice and services/powermanager.
Fix warnings.

Change-Id: I1da667083013379cd8240377c48d63fa5c53033d
2014-11-13 14:31:11 -08:00
Andreas Gampe 89fd4f7fa6 Frameworks/native: Wall Werror in surfaceflinger
Turn on -Wall -Werror in services/surfaceflinger. Fix warnings.

Change-Id: Ifef830300d9d4bc657d8f1257c02bfe8c2b4d9c5
2014-11-13 14:18:56 -08:00
Yabin Cui 0dd549aae0 kill HAVE_FORKEXEC
Bug: 18317407
Change-Id: I0c7b5886e5de12bdd95cfcc046bc87e4a6aeef5b
2014-11-12 17:10:40 -08:00
Andreas Gampe c5657b0c34 am fecc0bf4: Merge "Frameworks/native: Add pragmas to glgen headers"
* commit 'fecc0bf4f1d8d1939807123d0f01ca1fe377bda4':
  Frameworks/native: Add pragmas to glgen headers
2014-11-12 18:40:21 +00:00
Andreas Gampe fecc0bf4f1 Merge "Frameworks/native: Add pragmas to glgen headers" 2014-11-12 18:30:40 +00:00
Andreas Gampe b5da0d78d2 Frameworks/native: Add pragmas to glgen headers
The code currently being generated by glgen is not the cleanest, but
we would like to get core/jni onto -Werror. Thus add pragmas turning
off warnings locally to the C headers.

Also fix signed-comparison in two functions.

Longer term TODO: Emit clean code.

Change-Id: Iee8582f8c0c1de076d64851d3b6ca467afd5bc43
2014-11-12 10:10:12 -08:00
Jesse Hall 3b93c2b9d0 am 7b3fd290: Merge "EGL: make x86/64 wrappers resistant to -fno-omit-frame-pointer flag"
* commit '7b3fd29037bc12c2691e06334bf51171853aa8f3':
  EGL: make x86/64 wrappers resistant to -fno-omit-frame-pointer flag
2014-11-12 17:31:03 +00:00
Jesse Hall 7b3fd29037 Merge "EGL: make x86/64 wrappers resistant to -fno-omit-frame-pointer flag" 2014-11-12 17:21:27 +00:00
Lajos Molnar a1ae5a4fe5 implement asString() for OMX enumerations used by framework
Bug: 18285408
Change-Id: I7893cbf0b13514e0fe9001c90db3c8387c1920c0
2014-11-12 09:09:42 -08:00
Michal Wajdeczko 701048cbe8 EGL: make x86/64 wrappers resistant to -fno-omit-frame-pointer flag
Wrapper functions were broken on builds that forced -fno-omit-frame-pointer flag.

Change-Id: I5a80f9587fb3db821b4156af56acda59a0b4579b
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Yong Yao <yong.yao@intel.com>
2014-11-12 06:33:24 +00:00
Dianne Hackborn ba2e1a332e am ca69e8f2: Merge "Add tracking of parcel memory allocations." into lmp-mr1-dev
* commit 'ca69e8f2d0a1fc963bd170f9b2bf164028761323':
  Add tracking of parcel memory allocations.
2014-11-12 03:51:05 +00:00
Craig Mautner 66af95fa17 am 83cbc5a7: Merge "Stop consuming input on error dialogs." into lmp-mr1-dev
* commit '83cbc5a7588793435fd986e220fe1f9b88342069':
  Stop consuming input on error dialogs.
2014-11-12 03:51:04 +00:00
Dianne Hackborn ca69e8f2d0 Merge "Add tracking of parcel memory allocations." into lmp-mr1-dev 2014-11-12 00:24:29 +00:00
Dianne Hackborn 7e790af756 Add tracking of parcel memory allocations.
Change-Id: I76ffed0e69ccfe70e87d98646f11d4de7c3fd980
2014-11-11 16:23:04 -08:00
Craig Mautner 83cbc5a758 Merge "Stop consuming input on error dialogs." into lmp-mr1-dev 2014-11-12 00:16:07 +00:00
Dmitriy Ivanov 741625a17e resolved conflicts for merge of 37878b1e to lmp-mr1-dev-plus-aosp
Change-Id: I748a7d2fb43fd63189f4688edbd0991e2b609dba
2014-11-11 16:08:29 -08:00
Craig Mautner 0c17a2b2ea Stop consuming input on error dialogs.
This code is no longer necessary and was preventing input from
reaching their desired windows. See bug 17648830.

Change-Id: Ib1c026ece70e6fa98343340b89af4199d6d0ffca
2014-11-11 14:05:03 -08:00
Narayan Kamath 37878b1e57 Merge "Add an installd command to mark the end of boot." into lmp-mr1-dev 2014-11-11 16:12:59 +00:00
Narayan Kamath b1a6c2f95a Add an installd command to mark the end of boot.
bug: 18280671

Change-Id: I6b3aeaf143ab3b78881f163ec5c17b9bf20172ed
2014-11-10 17:04:12 +00:00
Ian Rogers 16a95b267a Add support for dalvik.vm.isa.<instruction set>.variant
Bug: 18056890
Change-Id: Ia266fa9f2a79158ced82016106aa1cd2529259c9
2014-11-08 16:58:13 -08:00
Andreas Gampe 32dc54a1c9 am bfd633e1: Frameworks/native: Fix unused parameter warning
* commit 'bfd633e131585d8e924b6a77c66284ec7e5dcc72':
  Frameworks/native: Fix unused parameter warning
2014-11-09 00:30:37 +00:00
Andreas Gampe bfd633e131 Frameworks/native: Fix unused parameter warning
Pulled in in hardware/, where -Werror is used.

Change-Id: I13fc31d31fe2f623d39c84862b0c95a28813723d
(cherry picked from commit a32900deec)
2014-11-08 22:18:47 +00:00
Andreas Gampe a32900deec Frameworks/native: Fix unused parameter warning
Pulled in in hardware/, where -Werror is used.

Change-Id: I13fc31d31fe2f623d39c84862b0c95a28813723d
2014-11-07 16:49:48 -08:00
Aravind Akella 686edee8e9 am a2614354: Merge "Add a timeout for releasing SensorService wake_lock." into lmp-mr1-dev
* commit 'a26143546e4665cc3b07d6527b63a2e4bb04fb9f':
  Add a timeout for releasing SensorService wake_lock.
2014-11-07 22:01:03 +00:00
Aravind Akella a26143546e Merge "Add a timeout for releasing SensorService wake_lock." into lmp-mr1-dev 2014-11-07 21:47:49 +00:00
Dan Stoza 8e624d4cad am 98d20f82: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
* commit '98d20f82ca8979b30c81df9639f54ab11e1951f9':
  Add a BufferItem parameter to onFrameAvailable
2014-11-07 20:03:42 +00:00
Dan Stoza 98d20f82ca Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev 2014-11-07 19:44:31 +00:00
Dan Stoza 8dc55396fc Add a BufferItem parameter to onFrameAvailable
Passes the BufferItem for the queued buffer to the onFrameAvailable
callback so the consumer can track the BufferQueue's contents. Also
adds an onFrameReplaced callback, which is necessary if the consumer
wants to do anything more than simple queue length tracking.

Bug: 18111837
Change-Id: If9d07229c9b586c668e5f99074e9b63b0468feb0
2014-11-07 10:39:13 -08:00
Dan Albert cad831fb15 am c6f93a43: Merge "Add missing include to fix libc++ build."
* commit 'c6f93a43d636b0ad16b75adf664c6a33d30b39dd':
  Add missing include to fix libc++ build.
2014-11-07 18:37:43 +00:00
Dan Albert c6f93a43d6 Merge "Add missing include to fix libc++ build." 2014-11-07 18:04:49 +00:00
Dan Albert 0d1c700214 Add missing include to fix libc++ build.
This was previously committed, but I guess it got lost in the merge
queue.

Bug: 15193147
Change-Id: Ic0e5d90ab403fb833d6a3bb7c55d279c56534869
2014-11-07 09:33:44 -08:00
Igor Murashkin cd647d01e5 am 106e5820: Merge "installd: Set priority to background for dexopting" into lmp-mr1-dev
* commit '106e582053121f1934c33a6c98d35377e8ae384a':
  installd: Set priority to background for dexopting
2014-11-06 02:55:23 +00:00
Jeff Tinker 5221104854 am 621c6f3b: Merge "Add missing secure stop methods" into lmp-mr1-dev
* commit '621c6f3b13f96b0e84163f355c6f3024cd3afb2e':
  Add missing secure stop methods
2014-11-06 02:44:25 +00:00
Igor Murashkin 106e582053 Merge "installd: Set priority to background for dexopting" into lmp-mr1-dev 2014-11-06 02:43:56 +00:00
Jeff Tinker 621c6f3b13 Merge "Add missing secure stop methods" into lmp-mr1-dev 2014-11-06 02:33:31 +00:00
Igor Murashkin 9e87a80140 installd: Set priority to background for dexopting
This fixes jank caused by dex2oat while installing an application in the
background.

Bug: 17497551
Change-Id: I5a69b00c0fd76ae22a0d1adb242bef6c18a75743
2014-11-05 15:21:12 -08:00