OSDN Git Service
Prashant Malani [Wed, 13 Jan 2016 18:50:03 +0000 (18:50 +0000)]
Revert "inputflinger: Add support for scaling and true value reporting" am:
2c09b78656 am:
cd7ddc7cac
am:
918263dac8
* commit '
918263dac8f7572dd90eeaadda651e117f735653':
Revert "inputflinger: Add support for scaling and true value reporting"
Prashant Malani [Wed, 13 Jan 2016 18:46:46 +0000 (18:46 +0000)]
Revert "inputflinger: Add support for scaling and true value reporting" am:
2c09b78656
am:
cd7ddc7cac
* commit '
cd7ddc7cac649f5630197d57bc098764c994aba6':
Revert "inputflinger: Add support for scaling and true value reporting"
Prashant Malani [Wed, 13 Jan 2016 18:44:02 +0000 (18:44 +0000)]
Revert "inputflinger: Add support for scaling and true value reporting"
am:
2c09b78656
* commit '
2c09b78656dd97727f94fada81845b133cf142f3':
Revert "inputflinger: Add support for scaling and true value reporting"
Prashant Malani [Wed, 13 Jan 2016 09:00:08 +0000 (01:00 -0800)]
Revert "inputflinger: Add support for scaling and true value reporting"
This reverts commit
ee03865fe5fc6ffe9deda0e0870a18206027cfaf.
Prashant Malani [Wed, 13 Jan 2016 05:37:31 +0000 (05:37 +0000)]
inputflinger: Add support for scaling and true value reporting am:
ee03865fe5 am:
a777e8b70f
am:
9363c7fa06
* commit '
9363c7fa063c45dc5e0bf35616928d1e036e2419':
inputflinger: Add support for scaling and true value reporting
Prashant Malani [Wed, 13 Jan 2016 05:35:45 +0000 (05:35 +0000)]
inputflinger: Add support for scaling and true value reporting am:
ee03865fe5
am:
a777e8b70f
* commit '
a777e8b70fce35e97dd8812df8b0b5eca17db550':
inputflinger: Add support for scaling and true value reporting
Prashant Malani [Wed, 13 Jan 2016 05:33:57 +0000 (05:33 +0000)]
inputflinger: Add support for scaling and true value reporting
am:
ee03865fe5
* commit '
ee03865fe5fc6ffe9deda0e0870a18206027cfaf':
inputflinger: Add support for scaling and true value reporting
Samuel Tan [Tue, 12 Jan 2016 23:14:46 +0000 (23:14 +0000)]
Merge "Add PersistableBundle.aidl into binder includes"
am:
0904094574
* commit '
09040945744f8a8634d7472836d6be3506a77d41':
Add PersistableBundle.aidl into binder includes
Samuel Tan [Tue, 12 Jan 2016 23:09:44 +0000 (23:09 +0000)]
Merge "Add PersistableBundle.aidl into binder includes"
Prashant Malani [Tue, 12 Jan 2016 01:08:18 +0000 (17:08 -0800)]
inputflinger: Add support for scaling and true value reporting
-1/+1 somewhat simplifies the values that can be generated by rotary
encoders, and rules out the possibility of batching and more nuanced
movement reporting.
So, we modify the device configuration to allow values other than -1 and
1 to be supported. In order to give the developer a sense of what these
values map to in terms of angular displacement, we also parse a
resolution configuration from the devices IDC file.
This will be specified as:
device.res = xxxx
of type float. If a value is not provided, a default res value of 0.0f
is used.
This patch also adds a per device scaling factor, which is used to
suitably modify the values reported (as well as the resolution) to tune
the input events generated and resulting UI according to the hardware.
This can be specified in the IDC file as:
device.scalingFactor = xxxx
of type float. If a scaling factor is not provided, a default of 1.0f
is used.
Bug:
22836852
Bug:
18707397
Change-Id: I13686f64de1b52d3f6c97b2587ae41e52d1db6e2
Samuel Tan [Mon, 21 Dec 2015 20:11:00 +0000 (12:11 -0800)]
Add PersistableBundle.aidl into binder includes
Add the PersistableBundle.aidl into the new /aidl/binder/
subdirectory (along with the necessary 'android' and 'os'
subdirectories) so that the aidl file will live alongside
its native implementation in libbinder. This change will
allow native-only Android checkouts (e.g. Brillo) to use
PersistableBundle.
The /aidl/ subdirectory should henceforth contain any
aidl files that live with native code.
BUG:
26292234
Change-Id: I07b49dad8afd679f33e41fa9044dffc02ec25e3e
Colin Cross [Tue, 5 Jan 2016 21:50:02 +0000 (21:50 +0000)]
Merge "libinstalld: add dependency on libselinux"
am:
9dee30750e
* commit '
9dee30750e85dcfc02fb9fd4cc6169957de91d0b':
libinstalld: add dependency on libselinux
Colin Cross [Tue, 5 Jan 2016 21:46:28 +0000 (21:46 +0000)]
Merge "libinstalld: add dependency on libselinux"
Nick Kralevich [Thu, 24 Dec 2015 03:16:38 +0000 (19:16 -0800)]
Merge "More O_CLOEXEC"
am:
43e4260831
* commit '
43e4260831cc3d0d96c05fe18a8cad3018b5795f':
More O_CLOEXEC
Nick Kralevich [Thu, 24 Dec 2015 02:59:16 +0000 (02:59 +0000)]
Merge "More O_CLOEXEC"
Nick Kralevich [Thu, 24 Dec 2015 02:58:05 +0000 (18:58 -0800)]
More O_CLOEXEC
Change-Id: I31991ed089f395174857e86e509b8190ad98f92a
Colin Cross [Tue, 22 Dec 2015 00:21:45 +0000 (16:21 -0800)]
libinstalld: add dependency on libselinux
libinstalld uses headers from libselinux, add a LOCAL_SHARED_LIBRARIES
dependency on libselinux.
Change-Id: Ic12c55547526638810bcc1ac952d205f2f163fd3
Mark Salyzyn [Fri, 18 Dec 2015 21:22:38 +0000 (21:22 +0000)]
dumpstate: increase logcat timeout to 40 seconds (DO NOT MERGE) am:
03d61d95fa
am:
dc482d7711 -s ours
* commit '
dc482d771158299d470f017d0bd5ada5db2a5a92':
dumpstate: increase logcat timeout to 40 seconds (DO NOT MERGE)
Mark Salyzyn [Fri, 18 Dec 2015 20:46:30 +0000 (20:46 +0000)]
dumpstate: increase logcat timeout to 40 seconds (DO NOT MERGE)
am:
03d61d95fa
* commit '
03d61d95fa6a321bf26548b320a1a9c8dc78e124':
dumpstate: increase logcat timeout to 40 seconds (DO NOT MERGE)
Mark Salyzyn [Fri, 18 Dec 2015 18:14:46 +0000 (10:14 -0800)]
dumpstate: increase logcat timeout to 40 seconds (DO NOT MERGE)
- temporary measure until root issues can be resolved.
Bug:
23685592
Change-Id: Ia33f4e3928a457c3dcd730ad2c2c57d13fbf133d
Samuel Tan [Thu, 17 Dec 2015 01:25:38 +0000 (01:25 +0000)]
Merge "Fix format specifiers for size_t types"
am:
0d77698233
* commit '
0d77698233ffcbc812c2586693546355ce521603':
Fix format specifiers for size_t types
Samuel Tan [Thu, 17 Dec 2015 01:19:10 +0000 (01:19 +0000)]
Merge "Fix format specifiers for size_t types"
Samuel Tan [Thu, 17 Dec 2015 01:13:29 +0000 (17:13 -0800)]
Fix format specifiers for size_t types
Use %zu instead of %u for logging size_t types, which
are of the unsigned long type, not the unsigned int type.
BUG: None
Change-Id: I5af6c2ea544a5f11b283bc9aebe8b5f0cfc605ec
Samuel Tan [Thu, 17 Dec 2015 00:48:42 +0000 (00:48 +0000)]
Merge "Add support for PersistableBundle in C++"
am:
aca58acb59
* commit '
aca58acb594efb35b51e49d2d330fe1dbe16d7fd':
Add support for PersistableBundle in C++
Samuel Tan [Thu, 17 Dec 2015 00:35:28 +0000 (00:35 +0000)]
Merge "Add support for PersistableBundle in C++"
Nick Kralevich [Wed, 16 Dec 2015 21:41:31 +0000 (21:41 +0000)]
Merge "atrace.rc: tracing should be disabled by default."
am:
cbd4cc737c
* commit '
cbd4cc737cc99b2ae7ac22ca4b2bb52b86b8e6ae':
atrace.rc: tracing should be disabled by default.
Nick Kralevich [Wed, 16 Dec 2015 21:31:46 +0000 (21:31 +0000)]
Merge "atrace.rc: tracing should be disabled by default."
Nick Kralevich [Wed, 16 Dec 2015 20:37:25 +0000 (12:37 -0800)]
atrace.rc: tracing should be disabled by default.
Bug:
26217098
Change-Id: I6066c433d19c2d1c220669a9a78f5085af8c1d4b
Casey Dahlin [Wed, 16 Dec 2015 00:49:46 +0000 (16:49 -0800)]
Merge "Allow null values for Parcel readers and writers"
am:
4df4842186
* commit '
4df484218624081ee5de68798fe8bbf26efdc069':
Allow null values for Parcel readers and writers
Casey Dahlin [Tue, 15 Dec 2015 21:04:16 +0000 (21:04 +0000)]
Merge "Allow null values for Parcel readers and writers"
Casey Dahlin [Wed, 25 Nov 2015 23:09:45 +0000 (15:09 -0800)]
Allow null values for Parcel readers and writers
Test: AIDL integration tests pass
Bug:
25969194
Change-Id: Ib7023c8e02af49e08c9921f1d097e5967c1d378e
Signed-off-by: Casey Dahlin <sadmac@google.com>
Casey Dahlin [Tue, 15 Dec 2015 01:46:50 +0000 (17:46 -0800)]
Merge "Don\'t redefine B_PACK_CHARS"
am:
478259b574
* commit '
478259b574b6353437b6d5a03caaa4449add428a':
Don't redefine B_PACK_CHARS
Casey Dahlin [Tue, 15 Dec 2015 01:09:50 +0000 (01:09 +0000)]
Merge "Don't redefine B_PACK_CHARS"
Casey Dahlin [Tue, 15 Dec 2015 00:09:06 +0000 (16:09 -0800)]
Don't redefine B_PACK_CHARS
Change-Id: I5dfaca405f0f866e697d5ae546ead8a8eb6de7ca
Test: make checkbuild succeeds
Bug:
25868260
Signed-off-by: Casey Dahlin <sadmac@google.com>
Felipe Leme [Mon, 14 Dec 2015 23:56:22 +0000 (23:56 +0000)]
Merge "Migrated dumpstate to C++."
am:
1f62517b36
* commit '
1f62517b3654a3c0e95ea4d5b3664fac8115acdf':
Migrated dumpstate to C++.
Felipe Leme [Mon, 14 Dec 2015 23:25:48 +0000 (23:25 +0000)]
Merge "Migrated dumpstate to C++."
Felipe Leme [Mon, 14 Dec 2015 23:09:56 +0000 (15:09 -0800)]
Migrated dumpstate to C++.
Changes required:
- Explicity casting function pointers.
- Moving variables initialization before 'goto' statements.
- Changing string references from 'char *' to 'const char *'.
- Using 'extern "C"' so device-dependent implementation of
'dumpstate_board()' can be written in C or C++.
BUG:
25563823
Change-Id: Ibeb70fd23e64e9b530736b554a372cb232fe1a44
Greg Hackmann [Mon, 14 Dec 2015 21:20:47 +0000 (13:20 -0800)]
Merge "atrace: add database tag"
am:
8b9c0e1af1
* commit '
8b9c0e1af14bf07b216edd1b995048790ddabaca':
atrace: add database tag
Samuel Tan [Tue, 24 Nov 2015 02:22:12 +0000 (18:22 -0800)]
Add support for PersistableBundle in C++
Add support for PersistableBundle, a mapping from
String values to various types, in C++.
BUG:
25815410
Change-Id: If609b294a1709314bb4220afc4f2269b556babb8
Greg Hackmann [Mon, 14 Dec 2015 21:12:52 +0000 (21:12 +0000)]
Merge "atrace: add database tag"
Mark Salyzyn [Mon, 14 Dec 2015 16:48:52 +0000 (08:48 -0800)]
Merge "dumpstate: Add security log dump"
am:
bc611a1d3e
* commit '
bc611a1d3e2beea849a251fecda096ed142519a6':
dumpstate: Add security log dump
Mark Salyzyn [Mon, 14 Dec 2015 16:33:00 +0000 (16:33 +0000)]
Merge "dumpstate: Add security log dump"
Mark Salyzyn [Fri, 11 Dec 2015 21:04:02 +0000 (13:04 -0800)]
dumpstate: Add security log dump
Bug:
26029733
Change-Id: I2e5b44d642bbac7f62f63388dd8a3123f2abeafe
Mark Salyzyn [Fri, 11 Dec 2015 19:01:01 +0000 (11:01 -0800)]
Merge "dumpstate: build breakage @
2482293"
am:
c93d0937e4
* commit '
c93d0937e4e86a260f4dc6b91971b6750f67a3f3':
dumpstate: build breakage @
2482293
Mark Salyzyn [Fri, 11 Dec 2015 18:43:21 +0000 (18:43 +0000)]
Merge "dumpstate: build breakage @
2482293"
Mark Salyzyn [Fri, 11 Dec 2015 18:41:52 +0000 (10:41 -0800)]
dumpstate: build breakage @
2482293
aosp is in C, internal is C++, struct must be explicit
Bug:
24200279
Change-Id: I1c9d8156a86db6de73ee5b70063e63b38170b052
Mark Salyzyn [Fri, 11 Dec 2015 15:24:05 +0000 (07:24 -0800)]
Merge "dumpstate: Dump eMMC 5.0 stats"
am:
f9b3fc457f
* commit '
f9b3fc457f22be834e6bc6c3f704d7ddb38dcbb8':
dumpstate: Dump eMMC 5.0 stats
Mark Salyzyn [Fri, 11 Dec 2015 15:17:26 +0000 (15:17 +0000)]
Merge "dumpstate: Dump eMMC 5.0 stats"
Mark Salyzyn [Wed, 9 Dec 2015 19:21:28 +0000 (11:21 -0800)]
dumpstate: Dump eMMC 5.0 stats
Extended csd EXT_CSD_REV, PRE_EOL_INFO, DEVICE_LIFE_TIME_EST_TYP_A,
and DEVICE_LIFE_TIME_EST_TYP_B fields printed if available. Allow
dumpstate access to /sys/kernel/debug/mmc0/mmc0:0001/ext_csd.
Bug:
24200279
Change-Id: I310bdcf546a9307cf927f109359ad5a6d24b70f8
Colin Cross [Thu, 10 Dec 2015 21:21:47 +0000 (13:21 -0800)]
Merge "Fix allocation count"
am:
b25116f735
* commit '
b25116f735e00467057085c18a984aca0cc93a84':
Fix allocation count
Colin Cross [Thu, 10 Dec 2015 21:15:19 +0000 (21:15 +0000)]
Merge "Fix allocation count"
Christopher Wiley [Wed, 9 Dec 2015 22:39:31 +0000 (14:39 -0800)]
Merge "libbinder: Enable service specific error codes"
am:
dff3651eed
* commit '
dff3651eed393f4a6e7b5fcbea1d91de981e91a0':
libbinder: Enable service specific error codes
Christopher Wiley [Wed, 9 Dec 2015 22:34:58 +0000 (22:34 +0000)]
Merge "libbinder: Enable service specific error codes"
Christopher Wiley [Sat, 21 Nov 2015 01:48:27 +0000 (17:48 -0800)]
libbinder: Enable service specific error codes
Add another factory method that takes a message and service
specific error code.
Bug:
25800533
Test: system/tools/aidl integration tests pass
Change-Id: I592cb7def0538576965d14c200ab58548b3bef32
Colin Cross [Wed, 9 Dec 2015 01:15:50 +0000 (17:15 -0800)]
Fix allocation count
The realloc case in continueWrite should not increment the counter,
the pointer passed to realloc is guaranteed to be non-NULL so the total
number of allocations will not have changed.
When realloc is called in restartWrite mData has not been checked
against NULL, increment the counter if it was NULL.
Bug:
26086286
Change-Id: I4c8af450cca1868b91793c0c5f0d8c4b4b5badbe
Dan Stoza [Tue, 8 Dec 2015 17:13:34 +0000 (17:13 +0000)]
Merge "Fix the execution point of onFrameAvailable/onFrameReplaced callbacks" am:
789ede379d
am:
67322258c0
* commit '
67322258c0a42852bee446a5a99f8b64e1953683':
Fix the execution point of onFrameAvailable/onFrameReplaced callbacks
Dan Stoza [Tue, 8 Dec 2015 17:08:13 +0000 (09:08 -0800)]
Merge "Fix the execution point of onFrameAvailable/onFrameReplaced callbacks"
am:
789ede379d
* commit '
789ede379d2f19ce284866c72bcaad7e8255b1cc':
Fix the execution point of onFrameAvailable/onFrameReplaced callbacks
Dan Stoza [Tue, 8 Dec 2015 17:05:25 +0000 (17:05 +0000)]
Merge "Fix the execution point of onFrameAvailable/onFrameReplaced callbacks"
Prashant Malani [Tue, 8 Dec 2015 01:36:18 +0000 (01:36 +0000)]
Merge "inputflinger: Initial support for rotary encoders." into cw-e-dev am:
68fca5a176 am:
e50ab08fd6
am:
b7b7fa1769
* commit '
b7b7fa1769b6a13461705309659846e99deb8cf2':
inputflinger: Initial support for rotary encoders.
Prashant Malani [Tue, 8 Dec 2015 01:33:04 +0000 (01:33 +0000)]
Merge "inputflinger: Initial support for rotary encoders." into cw-e-dev am:
68fca5a176
am:
e50ab08fd6
* commit '
e50ab08fd676c78bc1d826dc2172cf370feb54c0':
inputflinger: Initial support for rotary encoders.
Prashant Malani [Tue, 8 Dec 2015 01:30:53 +0000 (01:30 +0000)]
Merge "inputflinger: Initial support for rotary encoders." into cw-e-dev
am:
68fca5a176
* commit '
68fca5a1763203164a19a9aa983895242a671387':
inputflinger: Initial support for rotary encoders.
Prashant Malani [Tue, 8 Dec 2015 01:27:17 +0000 (01:27 +0000)]
Merge "inputflinger: Initial support for rotary encoders." into cw-e-dev
Dimitry Ivanov [Mon, 7 Dec 2015 23:39:17 +0000 (23:39 +0000)]
Merge "Replace libGLESv3 symlink with shared library" am:
18ff655766
am:
bc432368f4
* commit '
bc432368f410d628d21435c9f8fbcdf6bb68ef95':
Replace libGLESv3 symlink with shared library
Dimitry Ivanov [Mon, 7 Dec 2015 23:16:20 +0000 (23:16 +0000)]
Merge "Replace libGLESv3 symlink with shared library"
am:
18ff655766
* commit '
18ff6557667f3d130ad1f83e04f3b175f8b8cf6d':
Replace libGLESv3 symlink with shared library
Dimitry Ivanov [Mon, 7 Dec 2015 19:00:58 +0000 (19:00 +0000)]
Merge "Replace libGLESv3 symlink with shared library"
Christian Poetzsch [Mon, 7 Dec 2015 13:36:22 +0000 (13:36 +0000)]
Fix the execution point of onFrameAvailable/onFrameReplaced callbacks
In
a4650a5 the concept of a maximum frame number allowance for the consumer was
introduced. A call to acquireBuffers will only return buffers when their frame
number is less-than-or-equal-to this maximum frame number. When SurfaceFlinger
is the consumer, this maximum frame number is calculated in the
onFrameAvailable/onFrameReplaced callbacks. These callbacks are called when a
new buffer is dequeued by the application. The problem is that these callbacks
are called _after_ the fence wait which is used to throttle the frame
production of client apps. When the previous frame needs a long time to draw,
those waits can potentially be a long time. As a result SurfaceFlinger won't do
any composition with the new frame until the wait is over.
Normally this isn't a big problem because there is a queue of buffers for
SurfaceFlinger to work with. However, this changes massively when a client app
is using a swap interval of zero. In this case, a new frame will instantly
replace the previous queued frame. However, SurfaceFlinger doesn't know this
until the onFrameReplaced callback gets called - which is delayed by the fence
wait. If the timing is bad, SurfaceFlinger never gets a chance to pick up a new
frame to do the composition with.
We see this behaviour on our TC development system (slow GPU) with legacy
on-screen benchmarks. Such apps are using a swap interval of zero and sometimes
frames don't get updated for several seconds. This behaviour can be also seen
on a Nexus5, although it isn't as obvious as on our TC.
The fix in this cl is to move the EGL throttling to the end of the queueBuffers
function. This ensures that if a frame gets replaced in the queue, all
consumers who installed the callbacks, get called in a timely fashion.
Change-Id: I36e9ecda162150f41e97d4fb7437963a3d86b371
Signed-off-by: Christian Poetzsch <christian.potzsch@imgtec.com>
Bart Sears [Sat, 5 Dec 2015 03:45:09 +0000 (03:45 +0000)]
Merge "Revert "libbinder: Don\'t redefine B_PACK_CHARS"" am:
3f46d82d7b
am:
9bb03731ee
* commit '
9bb03731ee1f01abbc193a75ea08d632fbb2f81b':
Revert "libbinder: Don't redefine B_PACK_CHARS"
Bart Sears [Sat, 5 Dec 2015 03:42:14 +0000 (03:42 +0000)]
Merge "Revert "libbinder: Don\'t redefine B_PACK_CHARS""
am:
3f46d82d7b
* commit '
3f46d82d7b8ee0ae6295723311e5c986b649d727':
Revert "libbinder: Don't redefine B_PACK_CHARS"
Bart Sears [Sat, 5 Dec 2015 03:38:59 +0000 (03:38 +0000)]
Merge "Revert "libbinder: Don't redefine B_PACK_CHARS""
Bart Sears [Sat, 5 Dec 2015 03:38:34 +0000 (03:38 +0000)]
Revert "libbinder: Don't redefine B_PACK_CHARS"
This reverts commit
3eab1b40acbcc2e82b3e90da26706129019eccf9.
Change-Id: Iedc99961c6014029722f814e621970c1732f9092
Elliott Hughes [Sat, 5 Dec 2015 01:45:35 +0000 (01:45 +0000)]
Merge "Track rename from base/ to android-base/." am:
f31cf3ab0f
am:
c21980bc12
* commit '
c21980bc12db67c763a18b1abaa3ddd3689b1687':
Track rename from base/ to android-base/.
Elliott Hughes [Sat, 5 Dec 2015 01:39:36 +0000 (17:39 -0800)]
Merge "Track rename from base/ to android-base/."
am:
f31cf3ab0f
* commit '
f31cf3ab0f53394200c0f22a4591db741ba1ccb0':
Track rename from base/ to android-base/.
Elliott Hughes [Sat, 5 Dec 2015 01:33:52 +0000 (01:33 +0000)]
Merge "Track rename from base/ to android-base/."
Christopher Wiley [Sat, 5 Dec 2015 00:23:13 +0000 (00:23 +0000)]
Merge "libbinder: Don\'t redefine B_PACK_CHARS" am:
7166e7823c
am:
a1474da3b5
* commit '
a1474da3b5a521c2f33494b4a83e50841a399c15':
libbinder: Don't redefine B_PACK_CHARS
Christopher Wiley [Sat, 5 Dec 2015 00:20:15 +0000 (16:20 -0800)]
Merge "libbinder: Don\'t redefine B_PACK_CHARS"
am:
7166e7823c
* commit '
7166e7823cedb817f0278f569940aa86f424aa3b':
libbinder: Don't redefine B_PACK_CHARS
Christopher Wiley [Sat, 5 Dec 2015 00:15:12 +0000 (00:15 +0000)]
Merge "libbinder: Don't redefine B_PACK_CHARS"
Christopher Wiley [Fri, 4 Dec 2015 22:15:27 +0000 (14:15 -0800)]
libbinder: Don't redefine B_PACK_CHARS
This macro is defined in linux/binder.h which is *sometimes* included
before binder/IBinder.h depending on codepath.
Bug:
25868260
Test: Compiles
Change-Id: Ied1e6658936668c16cbdacab3a3205107c907655
Elliott Hughes [Fri, 4 Dec 2015 23:39:32 +0000 (15:39 -0800)]
Track rename from base/ to android-base/.
Change-Id: I62c18891ffe319d20ff084f5ca2aa0c038c23cd3
Martijn Coenen [Fri, 4 Dec 2015 22:16:54 +0000 (14:16 -0800)]
Merge "DO NOT MERGE: add support for new sched tracepoint" into mnc-dr1.5-dev am:
e902acb2ec
am:
6a6aa6f855
* commit '
6a6aa6f855dd8624d830423edd2e4582e54dcc97':
DO NOT MERGE: add support for new sched tracepoint
Martijn Coenen [Fri, 4 Dec 2015 09:34:50 +0000 (01:34 -0800)]
Merge "DO NOT MERGE: add support for new sched tracepoint" into mnc-dr1.5-dev
am:
e902acb2ec
* commit '
e902acb2ec74bc1b3cbf2359283e3bd9eccd88e9':
DO NOT MERGE: add support for new sched tracepoint
Martijn Coenen [Fri, 4 Dec 2015 09:31:34 +0000 (09:31 +0000)]
Merge "DO NOT MERGE: add support for new sched tracepoint" into mnc-dr1.5-dev
Christopher Wiley [Thu, 3 Dec 2015 21:26:58 +0000 (21:26 +0000)]
Merge "libbinder: Handle transaction failures correctly" am:
823fa55aec
am:
302abd03b6
* commit '
302abd03b6db600c41b353213002ba552b3e0097':
libbinder: Handle transaction failures correctly
Christopher Wiley [Thu, 3 Dec 2015 21:21:21 +0000 (21:21 +0000)]
Merge "libbinder: Handle transaction failures correctly"
am:
823fa55aec
* commit '
823fa55aec55684605e6f4c764ec20901066553c':
libbinder: Handle transaction failures correctly
Christopher Wiley [Thu, 3 Dec 2015 21:17:42 +0000 (21:17 +0000)]
Merge "libbinder: Handle transaction failures correctly"
Christopher Wiley [Mon, 23 Nov 2015 00:29:58 +0000 (16:29 -0800)]
libbinder: Handle transaction failures correctly
Java code expects status_t != OK to be caught at the JNI level in
android_util_Binder.cpp (see signalExceptionForError). We were
incorrectly mapping this kind of failure to a special exception type
and writing that exception type to parcels.
Instead, refuse to write EX_TRANSACTION_FAILED to a parcel and return
the status value instead.
While here, remove non-trivial constructors to push authors toward the
more explicit factory methods. Remove getException() and push authors
toward using the simpler getter methods. Fix minor camelCase issues.
Bug:
25615695
Test: system/tools/aidl integration tests still pass
Change-Id: I7cad3ac8ae8300b5ac0b466606f4934d01e503c5
Dan Stoza [Wed, 2 Dec 2015 18:37:54 +0000 (18:37 +0000)]
Merge "bug#460672 framebuffer surface can\'t keep triple buffer if define NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3" am:
b2e3095a60
am:
46f8beb07f
* commit '
46f8beb07fe2fa28b1c216485b91b894a1c8625b':
bug#460672 framebuffer surface can't keep triple buffer if define NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
Dan Stoza [Wed, 2 Dec 2015 18:34:06 +0000 (18:34 +0000)]
Merge "bug#460672 framebuffer surface can\'t keep triple buffer if define NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3"
am:
b2e3095a60
* commit '
b2e3095a604e16d5d80d1e3d38bb92a6c37bd127':
bug#460672 framebuffer surface can't keep triple buffer if define NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
Dan Stoza [Wed, 2 Dec 2015 18:27:05 +0000 (18:27 +0000)]
Merge "bug#460672 framebuffer surface can't keep triple buffer if define NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3"
james.zhang [Tue, 1 Dec 2015 09:55:11 +0000 (17:55 +0800)]
bug#460672 framebuffer surface can't keep triple buffer if define NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
[root cause ] framebuffer surface is in the same process of surface flinger
[changes ] call IGraphicBufferProducer::allocateBuffers on producer inside the DisplayDevice constructor to force-allocate all three buffers.
[side effects] none
[self test ]<tshark, enter and exit mainmenu>: ok
[reviewers ] zhongjun.chen
[change_type ] AOB --> google_original
[tag_product ] common
Change-Id: Ideb75d3aa1ed23b2fa4d263a120ea3ca39d01361
Ben Fennema [Wed, 2 Dec 2015 01:19:39 +0000 (01:19 +0000)]
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" am:
8c3e55f414 -s ours am:
da3af0896f -s ours
am:
4c3e4c6f14 -s ours
* commit '
4c3e4c6f1494643c60408eaf516791b2f3b1585c':
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
Ben Fennema [Wed, 2 Dec 2015 01:15:00 +0000 (01:15 +0000)]
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data" am:
8c3e55f414 -s ours
am:
da3af0896f -s ours
* commit '
da3af0896f8415425b7ca75cd1ec28f31a377a15':
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
Ben Fennema [Wed, 2 Dec 2015 01:11:29 +0000 (01:11 +0000)]
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
am:
8c3e55f414 -s ours
* commit '
8c3e55f4149deda3ec7c7a67fda81216d5f9af25':
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
Ben Fennema [Wed, 2 Dec 2015 01:04:40 +0000 (01:04 +0000)]
Revert "DO NOT MERGE ANYWHERE Add new interface for sensor physical data"
This reverts commit
d4db70a7b8b2d136c46c50f89b276f8150be5fc2.
Change-Id: Ifb52d5595970a5178e12c2a90da4aac0e38f5942
Jani Suonpera [Wed, 2 Dec 2015 00:33:44 +0000 (00:33 +0000)]
DO NOT MERGE ANYWHERE Add new interface for sensor physical data am:
d4db70a7b8 -s ours am:
37f1300ffc -s ours
am:
e51ffd15e9 -s ours
* commit '
e51ffd15e918543edf255d96822a0d371895feda':
DO NOT MERGE ANYWHERE Add new interface for sensor physical data
Jani Suonpera [Wed, 2 Dec 2015 00:29:43 +0000 (00:29 +0000)]
DO NOT MERGE ANYWHERE Add new interface for sensor physical data am:
d4db70a7b8 -s ours
am:
37f1300ffc -s ours
* commit '
37f1300ffc5a8712cbfc76910b9cfb3308dd75ca':
DO NOT MERGE ANYWHERE Add new interface for sensor physical data
Jani Suonpera [Wed, 2 Dec 2015 00:25:47 +0000 (00:25 +0000)]
DO NOT MERGE ANYWHERE Add new interface for sensor physical data
am:
d4db70a7b8 -s ours
* commit '
d4db70a7b8b2d136c46c50f89b276f8150be5fc2':
DO NOT MERGE ANYWHERE Add new interface for sensor physical data
Jani Suonpera [Fri, 9 Oct 2015 08:45:57 +0000 (11:45 +0300)]
DO NOT MERGE ANYWHERE Add new interface for sensor physical data
This is special solution only for emerald branch.
Changes including new const char* value/interface for sensor physical data. Sensor service and manager does not take care of content, structure or other
details of string. Sensor HAL is taking care of parsing data from string and setting values to Sensor HW.
Change-Id: I3abc3ddc7c6adc4b32a40b9a43f2a94c5af7b2b0
Signed-off-by: Ben Fennema <fennema@google.com>
Sharvil Nanavati [Mon, 30 Nov 2015 21:15:51 +0000 (21:15 +0000)]
Increase raft timeout to 10min so we get complete logs from older devices. am:
804339a59e am:
7126caa17f
am:
c3ee5e8fb9
* commit '
c3ee5e8fb94e1af7338e4217afb3365531ae0309':
Increase raft timeout to 10min so we get complete logs from older devices.
Sharvil Nanavati [Mon, 30 Nov 2015 21:11:38 +0000 (21:11 +0000)]
Increase raft timeout to 10min so we get complete logs from older devices. am:
804339a59e
am:
7126caa17f
* commit '
7126caa17f4b76632335daa8090ba9e37db35102':
Increase raft timeout to 10min so we get complete logs from older devices.
Sharvil Nanavati [Mon, 30 Nov 2015 21:07:46 +0000 (21:07 +0000)]
Increase raft timeout to 10min so we get complete logs from older devices.
am:
804339a59e
* commit '
804339a59e4abcbcf5a50a60ff0543e6b404e572':
Increase raft timeout to 10min so we get complete logs from older devices.