OSDN Git Service
Ian Rogers [Fri, 14 Nov 2014 19:18:05 +0000 (19:18 +0000)]
am
35e5423d: am
11bf9e5c: Merge "Add support for dalvik.vm.isa.<instruction set>.variant"
* commit '
35e5423d4df88e8a0d0b4a7d4ca723e43a3bf35c':
Add support for dalvik.vm.isa.<instruction set>.variant
Yabin Cui [Fri, 14 Nov 2014 19:15:44 +0000 (19:15 +0000)]
am
007335e6: am
bc49cd07: Merge "kill HAVE_FORKEXEC"
* commit '
007335e68843a1128b704760a1decf89a124f468':
kill HAVE_FORKEXEC
Andreas Gampe [Fri, 14 Nov 2014 19:15:35 +0000 (19:15 +0000)]
am
d09cf8f1: am
9c17fb19: Merge "Frameworks/native: Wall Werror in batteryservice & powermanager"
* commit '
d09cf8f10f78ef3db2ab4824dc8374360dc7a860':
Frameworks/native: Wall Werror in batteryservice & powermanager
Dan Albert [Fri, 14 Nov 2014 19:09:30 +0000 (11:09 -0800)]
resolved conflicts for merge of
4037c458 to master
Change-Id: I8a2e73b7ba48b790054e0ab99f81b2693244389e
Ian Rogers [Fri, 14 Nov 2014 00:30:33 +0000 (00:30 +0000)]
am
11bf9e5c: Merge "Add support for dalvik.vm.isa.<instruction set>.variant"
* commit '
11bf9e5c2f90101d56d918e1b3fe780b873e5566':
Add support for dalvik.vm.isa.<instruction set>.variant
Ian Rogers [Fri, 14 Nov 2014 00:20:51 +0000 (00:20 +0000)]
Merge "Add support for dalvik.vm.isa.<instruction set>.variant"
Yabin Cui [Thu, 13 Nov 2014 23:35:25 +0000 (23:35 +0000)]
am
bc49cd07: Merge "kill HAVE_FORKEXEC"
* commit '
bc49cd07664d8a590bc6ed44884ba9405f6b706e':
kill HAVE_FORKEXEC
Yabin Cui [Thu, 13 Nov 2014 23:22:26 +0000 (23:22 +0000)]
Merge "kill HAVE_FORKEXEC"
Andreas Gampe [Thu, 13 Nov 2014 23:19:37 +0000 (23:19 +0000)]
am
9c17fb19: Merge "Frameworks/native: Wall Werror in batteryservice & powermanager"
* commit '
9c17fb191253e9bdc9fc73ba9ff2d590892e5061':
Frameworks/native: Wall Werror in batteryservice & powermanager
Andreas Gampe [Thu, 13 Nov 2014 22:59:49 +0000 (14:59 -0800)]
resolved conflicts for merge of
07dffa18 to lmp-mr1-dev-plus-aosp
Change-Id: I42d8bc291f4f48f3098754b076889159c4b20e41
Andreas Gampe [Thu, 13 Nov 2014 22:55:41 +0000 (22:55 +0000)]
Merge "Frameworks/native: Wall Werror in batteryservice & powermanager"
Andreas Gampe [Thu, 13 Nov 2014 22:33:47 +0000 (22:33 +0000)]
Merge "Frameworks/native: Wall Werror in surfaceflinger"
Andreas Gampe [Thu, 13 Nov 2014 22:31:11 +0000 (14:31 -0800)]
Frameworks/native: Wall Werror in batteryservice & powermanager
Turn on -Wall -Werror in services/batteryservice and services/powermanager.
Fix warnings.
Change-Id: I1da667083013379cd8240377c48d63fa5c53033d
Andreas Gampe [Thu, 13 Nov 2014 22:18:56 +0000 (14:18 -0800)]
Frameworks/native: Wall Werror in surfaceflinger
Turn on -Wall -Werror in services/surfaceflinger. Fix warnings.
Change-Id: Ifef830300d9d4bc657d8f1257c02bfe8c2b4d9c5
Yabin Cui [Tue, 11 Nov 2014 17:26:00 +0000 (09:26 -0800)]
kill HAVE_FORKEXEC
Bug:
18317407
Change-Id: I0c7b5886e5de12bdd95cfcc046bc87e4a6aeef5b
Dan Stoza [Wed, 12 Nov 2014 20:14:29 +0000 (20:14 +0000)]
Merge "Enable clang for libui/libgui/surfaceflinger"
Andreas Gampe [Wed, 12 Nov 2014 19:12:59 +0000 (19:12 +0000)]
am
c5657b0c: am
fecc0bf4: Merge "Frameworks/native: Add pragmas to glgen headers"
* commit '
c5657b0c344b39d794c4c8241004d4e19341c096':
Frameworks/native: Add pragmas to glgen headers
Andreas Gampe [Wed, 12 Nov 2014 18:40:21 +0000 (18:40 +0000)]
am
fecc0bf4: Merge "Frameworks/native: Add pragmas to glgen headers"
* commit '
fecc0bf4f1d8d1939807123d0f01ca1fe377bda4':
Frameworks/native: Add pragmas to glgen headers
Andreas Gampe [Wed, 12 Nov 2014 18:30:40 +0000 (18:30 +0000)]
Merge "Frameworks/native: Add pragmas to glgen headers"
Andreas Gampe [Tue, 11 Nov 2014 06:51:01 +0000 (22:51 -0800)]
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
Jesse Hall [Wed, 12 Nov 2014 17:36:52 +0000 (17:36 +0000)]
am
3b93c2b9: am
7b3fd290: Merge "EGL: make x86/64 wrappers resistant to -fno-omit-frame-pointer flag"
* commit '
3b93c2b9d0bd4495b6d0fa5f834214f6665873ab':
EGL: make x86/64 wrappers resistant to -fno-omit-frame-pointer flag
Jesse Hall [Wed, 12 Nov 2014 17:31:03 +0000 (17:31 +0000)]
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
Jesse Hall [Wed, 12 Nov 2014 17:21:26 +0000 (17:21 +0000)]
Merge "EGL: make x86/64 wrappers resistant to -fno-omit-frame-pointer flag"
Dianne Hackborn [Wed, 12 Nov 2014 16:36:49 +0000 (16:36 +0000)]
am
ba2e1a33: am
ca69e8f2: Merge "Add tracking of parcel memory allocations." into lmp-mr1-dev
* commit '
ba2e1a332eb24fcf4eef3634b8233d1681fd1309':
Add tracking of parcel memory allocations.
Craig Mautner [Wed, 12 Nov 2014 16:36:48 +0000 (16:36 +0000)]
am
66af95fa: am
83cbc5a7: Merge "Stop consuming input on error dialogs." into lmp-mr1-dev
* commit '
66af95fa175baa8c0c9b9b2caa5141f66d635928':
Stop consuming input on error dialogs.
Michal Wajdeczko [Fri, 8 Aug 2014 15:26:25 +0000 (17:26 +0200)]
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>
Dianne Hackborn [Wed, 12 Nov 2014 03:51:05 +0000 (03:51 +0000)]
am
ca69e8f2: Merge "Add tracking of parcel memory allocations." into lmp-mr1-dev
* commit '
ca69e8f2d0a1fc963bd170f9b2bf164028761323':
Add tracking of parcel memory allocations.
Craig Mautner [Wed, 12 Nov 2014 03:51:04 +0000 (03:51 +0000)]
am
83cbc5a7: Merge "Stop consuming input on error dialogs." into lmp-mr1-dev
* commit '
83cbc5a7588793435fd986e220fe1f9b88342069':
Stop consuming input on error dialogs.
Dmitriy Ivanov [Wed, 12 Nov 2014 03:43:22 +0000 (03:43 +0000)]
am
741625a1: resolved conflicts for merge of
37878b1e to lmp-mr1-dev-plus-aosp
* commit '
741625a17e80bc0ad8e728ba73536386efb1fb4d':
Add an installd command to mark the end of boot.
Dianne Hackborn [Wed, 12 Nov 2014 00:24:28 +0000 (00:24 +0000)]
Merge "Add tracking of parcel memory allocations." into lmp-mr1-dev
Dianne Hackborn [Tue, 11 Nov 2014 20:22:53 +0000 (12:22 -0800)]
Add tracking of parcel memory allocations.
Change-Id: I76ffed0e69ccfe70e87d98646f11d4de7c3fd980
Craig Mautner [Wed, 12 Nov 2014 00:16:07 +0000 (00:16 +0000)]
Merge "Stop consuming input on error dialogs." into lmp-mr1-dev
Dmitriy Ivanov [Wed, 12 Nov 2014 00:08:29 +0000 (16:08 -0800)]
resolved conflicts for merge of
37878b1e to lmp-mr1-dev-plus-aosp
Change-Id: I748a7d2fb43fd63189f4688edbd0991e2b609dba
Dan Stoza [Tue, 11 Nov 2014 18:32:31 +0000 (10:32 -0800)]
Enable clang for libui/libgui/surfaceflinger
Enables clang and C++11 for libui/libgui/surfaceflinger, and
eliminates all compile-time warnings.
Change-Id: Ie237fdb5ae44f2bfcddaa884f9c65ec3f08ae50f
Craig Mautner [Tue, 11 Nov 2014 21:28:43 +0000 (13:28 -0800)]
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
Narayan Kamath [Tue, 11 Nov 2014 16:12:58 +0000 (16:12 +0000)]
Merge "Add an installd command to mark the end of boot." into lmp-mr1-dev
Narayan Kamath [Mon, 10 Nov 2014 15:03:46 +0000 (15:03 +0000)]
Add an installd command to mark the end of boot.
bug:
18280671
Change-Id: I6b3aeaf143ab3b78881f163ec5c17b9bf20172ed
Ian Rogers [Sun, 9 Nov 2014 00:58:13 +0000 (16:58 -0800)]
Add support for dalvik.vm.isa.<instruction set>.variant
Bug:
18056890
Change-Id: Ia266fa9f2a79158ced82016106aa1cd2529259c9
Andreas Gampe [Sun, 9 Nov 2014 00:34:33 +0000 (00:34 +0000)]
am
32dc54a1: am
bfd633e1: Frameworks/native: Fix unused parameter warning
* commit '
32dc54a1c9a717ee5a7ebdf417bfeafa115c9c59':
Frameworks/native: Fix unused parameter warning
Andreas Gampe [Sun, 9 Nov 2014 00:30:37 +0000 (00:30 +0000)]
am
bfd633e1: Frameworks/native: Fix unused parameter warning
* commit '
bfd633e131585d8e924b6a77c66284ec7e5dcc72':
Frameworks/native: Fix unused parameter warning
Andreas Gampe [Sat, 8 Nov 2014 00:49:48 +0000 (16:49 -0800)]
Frameworks/native: Fix unused parameter warning
Pulled in in hardware/, where -Werror is used.
Change-Id: I13fc31d31fe2f623d39c84862b0c95a28813723d
(cherry picked from commit
a32900deec6284973100a29f7b399d061f82b3a8)
Andreas Gampe [Sat, 8 Nov 2014 00:55:44 +0000 (00:55 +0000)]
am
a32900de: Frameworks/native: Fix unused parameter warning
* commit '
a32900deec6284973100a29f7b399d061f82b3a8':
Frameworks/native: Fix unused parameter warning
Andreas Gampe [Sat, 8 Nov 2014 00:49:48 +0000 (16:49 -0800)]
Frameworks/native: Fix unused parameter warning
Pulled in in hardware/, where -Werror is used.
Change-Id: I13fc31d31fe2f623d39c84862b0c95a28813723d
Aravind Akella [Fri, 7 Nov 2014 22:08:47 +0000 (22:08 +0000)]
am
686edee8: am
a2614354: Merge "Add a timeout for releasing SensorService wake_lock." into lmp-mr1-dev
* commit '
686edee8e9894363caf8f01b370a6d3c9bc13e91':
Add a timeout for releasing SensorService wake_lock.
Aravind Akella [Fri, 7 Nov 2014 22:01:03 +0000 (22:01 +0000)]
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.
Aravind Akella [Fri, 7 Nov 2014 21:47:48 +0000 (21:47 +0000)]
Merge "Add a timeout for releasing SensorService wake_lock." into lmp-mr1-dev
Dan Stoza [Fri, 7 Nov 2014 20:09:39 +0000 (20:09 +0000)]
am
8e624d4c: am
98d20f82: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
* commit '
8e624d4cad45532c09879356f3adaa3b65fdcfc9':
Add a BufferItem parameter to onFrameAvailable
Dan Stoza [Fri, 7 Nov 2014 20:03:42 +0000 (20:03 +0000)]
am
98d20f82: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
* commit '
98d20f82ca8979b30c81df9639f54ab11e1951f9':
Add a BufferItem parameter to onFrameAvailable
Dan Stoza [Fri, 7 Nov 2014 19:44:30 +0000 (19:44 +0000)]
Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
Dan Albert [Fri, 7 Nov 2014 18:41:43 +0000 (18:41 +0000)]
am
cad831fb: am
c6f93a43: Merge "Add missing include to fix libc++ build."
* commit '
cad831fb15f3c35945cb250d95d31c9b43d65785':
Add missing include to fix libc++ build.
Dan Stoza [Tue, 4 Nov 2014 19:37:46 +0000 (11:37 -0800)]
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
Dan Albert [Fri, 7 Nov 2014 18:37:43 +0000 (18:37 +0000)]
am
c6f93a43: Merge "Add missing include to fix libc++ build."
* commit '
c6f93a43d636b0ad16b75adf664c6a33d30b39dd':
Add missing include to fix libc++ build.
Dan Albert [Fri, 7 Nov 2014 18:04:49 +0000 (18:04 +0000)]
Merge "Add missing include to fix libc++ build."
Dan Albert [Fri, 7 Nov 2014 17:33:44 +0000 (09:33 -0800)]
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
Igor Murashkin [Thu, 6 Nov 2014 03:01:51 +0000 (03:01 +0000)]
am
cd647d01: am
106e5820: Merge "installd: Set priority to background for dexopting" into lmp-mr1-dev
* commit '
cd647d01e5e5a17c272f1a0c691c39cb24ae107c':
installd: Set priority to background for dexopting
Igor Murashkin [Thu, 6 Nov 2014 02:55:23 +0000 (02:55 +0000)]
am
106e5820: Merge "installd: Set priority to background for dexopting" into lmp-mr1-dev
* commit '
106e582053121f1934c33a6c98d35377e8ae384a':
installd: Set priority to background for dexopting
Jeff Tinker [Thu, 6 Nov 2014 02:48:18 +0000 (02:48 +0000)]
am
52211048: am
621c6f3b: Merge "Add missing secure stop methods" into lmp-mr1-dev
* commit '
522110485465a05f4602ad42ba14a18b11184cca':
Add missing secure stop methods
Jeff Tinker [Thu, 6 Nov 2014 02:44:25 +0000 (02:44 +0000)]
am
621c6f3b: Merge "Add missing secure stop methods" into lmp-mr1-dev
* commit '
621c6f3b13f96b0e84163f355c6f3024cd3afb2e':
Add missing secure stop methods
Igor Murashkin [Thu, 6 Nov 2014 02:43:56 +0000 (02:43 +0000)]
Merge "installd: Set priority to background for dexopting" into lmp-mr1-dev
Jeff Tinker [Thu, 6 Nov 2014 02:33:31 +0000 (02:33 +0000)]
Merge "Add missing secure stop methods" into lmp-mr1-dev
Igor Murashkin [Wed, 5 Nov 2014 23:21:12 +0000 (15:21 -0800)]
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
Michael Lentine [Wed, 5 Nov 2014 20:11:32 +0000 (20:11 +0000)]
am
a2f27a0d: am
26645298: Merge "Fix for corruption when numFds or numInts is too large." into lmp-mr1-dev
* commit '
a2f27a0d63da87b23bf214355882bbcea6a163ea':
Fix for corruption when numFds or numInts is too large.
Michael Lentine [Wed, 5 Nov 2014 19:06:19 +0000 (19:06 +0000)]
am
26645298: Merge "Fix for corruption when numFds or numInts is too large." into lmp-mr1-dev
* commit '
26645298400c0ae3a95731388364263d6a914ee4':
Fix for corruption when numFds or numInts is too large.
Michael Lentine [Wed, 5 Nov 2014 18:58:22 +0000 (18:58 +0000)]
Merge "Fix for corruption when numFds or numInts is too large." into lmp-mr1-dev
Dan Albert [Wed, 5 Nov 2014 05:46:14 +0000 (21:46 -0800)]
Add a missing include.
Was being included transitively by stlport.
Bug:
15193147
Change-Id: If462e5ddcf4a620367fb4b5533f44960fd3b7378
Dan Albert [Wed, 5 Nov 2014 03:29:55 +0000 (03:29 +0000)]
am
090dbeb7: am
c90b7d9c: am
d12586b8: Merge "Move hwc tests to libc++."
* commit '
090dbeb7f174e5c1c605d8d91ef0faa2c46e9ee3':
Move hwc tests to libc++.
Dan Albert [Wed, 5 Nov 2014 02:57:31 +0000 (02:57 +0000)]
am
c90b7d9c: am
d12586b8: Merge "Move hwc tests to libc++."
* commit '
c90b7d9c0f1df1cec8afbfebad0f111d878113e7':
Move hwc tests to libc++.
Dan Albert [Wed, 5 Nov 2014 02:41:59 +0000 (02:41 +0000)]
am
d12586b8: Merge "Move hwc tests to libc++."
* commit '
d12586b8593cf0cb894d02104a9794ed9dd85d16':
Move hwc tests to libc++.
Dan Albert [Wed, 5 Nov 2014 01:38:09 +0000 (01:38 +0000)]
Merge "Move hwc tests to libc++."
Dan Albert [Wed, 5 Nov 2014 01:25:12 +0000 (17:25 -0800)]
Move hwc tests to libc++.
Since these tests were pulling in a static library linked against
stlport, the tests needed to be explicit about which STL they're
using. Might as well be libc++.
Bug:
15193147
Change-Id: I4e0fc4ea10f7982dd04e7baaf57139dd5d55543e
Mark Salyzyn [Wed, 5 Nov 2014 00:21:48 +0000 (00:21 +0000)]
am
ea14602e: am
9cea6ccb: dumpstate: report device uptime mmc performance
* commit '
ea14602e6e1e415f3c6b53ef498d4deff00c23ac':
dumpstate: report device uptime mmc performance
Mark Salyzyn [Wed, 5 Nov 2014 00:15:47 +0000 (00:15 +0000)]
am
9cea6ccb: dumpstate: report device uptime mmc performance
* commit '
9cea6ccbd8789f9583c78ce2b36ac5dd75717b6c':
dumpstate: report device uptime mmc performance
Jesse Hall [Tue, 4 Nov 2014 17:40:28 +0000 (17:40 +0000)]
am
06ce1094: am
fee99040: Revert "Add more logging for dup(fd) failure"
* commit '
06ce1094706bb0856f6cc876e1f5276adc642446':
Revert "Add more logging for dup(fd) failure"
Jesse Hall [Tue, 4 Nov 2014 17:40:27 +0000 (17:40 +0000)]
am
88361aaa: am
8e5cf83a: Revert "Parcel: extra validation/debug code for writeDupFileDescriptor"
* commit '
88361aaaf4f2339f50dc32438a261283c642d471':
Revert "Parcel: extra validation/debug code for writeDupFileDescriptor"
Jesse Hall [Tue, 4 Nov 2014 17:40:27 +0000 (17:40 +0000)]
am
aa4ccfd1: am
de288fe2: Revert "bufferqueue: workaround: allow NULL fence with queueBuffer"
* commit '
aa4ccfd123620f8dd28c4ae65a2a5aa3b8a0f83e':
Revert "bufferqueue: workaround: allow NULL fence with queueBuffer"
Mark Salyzyn [Tue, 4 Nov 2014 17:38:19 +0000 (09:38 -0800)]
dumpstate: report device uptime mmc performance
Bug:
18085992
Change-Id: Ibc0a37d3d2649d1e6708d9357f37ed75f2cea121
Jesse Hall [Tue, 4 Nov 2014 17:35:23 +0000 (17:35 +0000)]
am
fee99040: Revert "Add more logging for dup(fd) failure"
* commit '
fee99040de000a64f6036a7db172fb7c68d9764a':
Revert "Add more logging for dup(fd) failure"
Jesse Hall [Tue, 4 Nov 2014 17:35:23 +0000 (17:35 +0000)]
am
8e5cf83a: Revert "Parcel: extra validation/debug code for writeDupFileDescriptor"
* commit '
8e5cf83afbe2b671f96d04786cf0d0f967e342f9':
Revert "Parcel: extra validation/debug code for writeDupFileDescriptor"
Jesse Hall [Tue, 4 Nov 2014 17:35:22 +0000 (17:35 +0000)]
am
de288fe2: Revert "bufferqueue: workaround: allow NULL fence with queueBuffer"
* commit '
de288fe2d43adfa1b2243ae534faaf832bf50491':
Revert "bufferqueue: workaround: allow NULL fence with queueBuffer"
Jesse Hall [Tue, 4 Nov 2014 16:36:31 +0000 (08:36 -0800)]
Revert "Add more logging for dup(fd) failure"
Underlying bug has been fixed, extra debug code no longer needed
This reverts commit
36273c991b189c5516819f4d5e3f83061c320593.
Change-Id: Ia47f1ae9ee7338329bfb8d710aff57e15e944f20
Jesse Hall [Tue, 4 Nov 2014 16:35:12 +0000 (08:35 -0800)]
Revert "Parcel: extra validation/debug code for writeDupFileDescriptor"
Underlying bug has been fixed, extra debug code no longer needed.
This reverts commit
ccf851f108c008d086b7f3c3923d60d385985e71.
Change-Id: I19ad9239efdf1d8f70cd74af9b7c2ae97713208f
Jesse Hall [Tue, 4 Nov 2014 16:30:48 +0000 (08:30 -0800)]
Revert "bufferqueue: workaround: allow NULL fence with queueBuffer"
Underlying bug has been fixed, workaround no longer needed
This reverts commit
5b0cbcf9464dbcda9d19ae978911222806ec8bdc.
Change-Id: Ic9532b407d1291a7780a12a75aaa117ae4aa9fcb
Chih-Hung Hsieh [Tue, 4 Nov 2014 02:09:30 +0000 (02:09 +0000)]
am
923b0f6a: am
ac5cd96f: am
dbab409c: Merge "Avoid two warnings from clang."
* commit '
923b0f6a6787462509c23349ac04b8e9360c51cc':
Avoid two warnings from clang.
Chih-Hung Hsieh [Tue, 4 Nov 2014 01:58:17 +0000 (01:58 +0000)]
am
ac5cd96f: am
dbab409c: Merge "Avoid two warnings from clang."
* commit '
ac5cd96fe24690d9e0ae823c77334b8579139aa2':
Avoid two warnings from clang.
Chih-Hung Hsieh [Tue, 4 Nov 2014 01:24:07 +0000 (01:24 +0000)]
am
dbab409c: Merge "Avoid two warnings from clang."
* commit '
dbab409c49ca5dd6686912d0b3eeb19ef1c37a3e':
Avoid two warnings from clang.
Naseer Ahmed [Tue, 4 Nov 2014 01:18:08 +0000 (01:18 +0000)]
am
ff520bb9: am
7aa0c47e: sf: Add a NULL check in getDisplayConfigs
* commit '
ff520bb93812f9892da526ace81efce9b0872503':
sf: Add a NULL check in getDisplayConfigs
Chih-Hung Hsieh [Tue, 4 Nov 2014 01:14:16 +0000 (01:14 +0000)]
Merge "Avoid two warnings from clang."
Naseer Ahmed [Mon, 3 Nov 2014 22:31:50 +0000 (22:31 +0000)]
am
7aa0c47e: sf: Add a NULL check in getDisplayConfigs
* commit '
7aa0c47e4205c6fca136c38f272d911c25c8a8fa':
sf: Add a NULL check in getDisplayConfigs
Michael Lentine [Fri, 31 Oct 2014 22:25:03 +0000 (15:25 -0700)]
Fix for corruption when numFds or numInts is too large.
Bug:
18076253
Change-Id: I4c5935440013fc755e1d123049290383f4659fb6
Naseer Ahmed [Mon, 3 Nov 2014 19:49:23 +0000 (14:49 -0500)]
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: I1a12f43b7c375b9c01998dadd5b658275c733fb2
Acked-by: Tatenda Chipeperekwa <tatendac@codeaurora.org>
Aravind Akella [Thu, 30 Oct 2014 00:55:20 +0000 (17:55 -0700)]
Add a timeout for releasing SensorService wake_lock.
If SensorService is holding a wake_lock and there are no acknowledgements
from ANY app within 5 seconds, release the wake_lock and reset the wake_lock
refcounts for all connections.
Bug:
16874240
Change-Id: I5e950dd393c20173c439cbd5a4ba614ee09d61f4
Michael Lentine [Sat, 1 Nov 2014 00:41:16 +0000 (00:41 +0000)]
am
54430ca2: am
793fc0e1: Merge "Fix crash when user provides large values in the Parcel." into lmp-mr1-dev
* commit '
54430ca2a88f57c709ea2924ea0b78820ae62643':
Fix crash when user provides large values in the Parcel.
Michael Lentine [Sat, 1 Nov 2014 00:33:29 +0000 (00:33 +0000)]
am
793fc0e1: Merge "Fix crash when user provides large values in the Parcel." into lmp-mr1-dev
* commit '
793fc0e13d25bdecda1219999f8be2cb3c121d20':
Fix crash when user provides large values in the Parcel.
Michael Lentine [Fri, 31 Oct 2014 23:37:47 +0000 (23:37 +0000)]
Merge "Fix crash when user provides large values in the Parcel." into lmp-mr1-dev
Michael Lentine [Fri, 31 Oct 2014 18:10:13 +0000 (11:10 -0700)]
Fix crash when user provides large values in the Parcel.
Bug:
18102648
Change-Id: Ie6a24718e586a34424238363de80f9545951514f
Michael Lentine [Fri, 31 Oct 2014 23:07:01 +0000 (23:07 +0000)]
am
078794ed: am
98536859: Merge "Fix output of pointers for 64bit devices." into lmp-mr1-dev
* commit '
078794ed377e7080ee155a632482bb98f1c9ade7':
Fix output of pointers for 64bit devices.
Jesse Hall [Fri, 31 Oct 2014 23:07:01 +0000 (23:07 +0000)]
am
b43a1c9b: am
affc4d80: Merge "surfaceflinger: fix -Wunused-parameter warning" into lmp-mr1-dev
* commit '
b43a1c9be2046345d61fb0d0a5fd06eda5cbe31e':
surfaceflinger: fix -Wunused-parameter warning
Jesse Hall [Fri, 31 Oct 2014 23:07:00 +0000 (23:07 +0000)]
am
18b846dd: am
c7636f60: Merge "surfaceflinger: fix -Wsign-compare warnings" into lmp-mr1-dev
* commit '
18b846dda798709796be078a7978d885685df9a4':
surfaceflinger: fix -Wsign-compare warnings
Jesse Hall [Fri, 31 Oct 2014 23:06:59 +0000 (23:06 +0000)]
am
9fc06c5e: am
6e74e3cc: Merge "surfaceflinger: fix -Woverloaded-virtual warning" into lmp-mr1-dev
* commit '
9fc06c5e2131cdf0d76a3838215c057f57da67e3':
surfaceflinger: fix -Woverloaded-virtual warning
Jesse Hall [Fri, 31 Oct 2014 22:58:46 +0000 (22:58 +0000)]
am
31705817: resolved conflicts for merge of
04c9683a to lmp-mr1-dev-plus-aosp
* commit '
3170581704fa59a8672262c0e6c68f455d470214':
surfaceflinger: fix -Wmismatched-tags warnings
OSDN Git Service
