Narayan Kamath
aefb0179a5
am c2ac5897: am 065e9c86: Merge "Fix mips build for libbinder."
...
* commit 'c2ac5897eccc681c8642095d4f8af13115de3ffb':
Fix mips build for libbinder.
2014-06-04 17:32:14 +00:00
Narayan Kamath
c2ac5897ec
am 065e9c86: Merge "Fix mips build for libbinder."
...
* commit '065e9c86e249beac08783c7e9334d5709e2c9080':
Fix mips build for libbinder.
2014-06-04 17:28:38 +00:00
Narayan Kamath
065e9c86e2
Merge "Fix mips build for libbinder."
2014-06-04 14:53:08 +00:00
Narayan Kamath
2f1f742b90
Fix mips build for libbinder.
...
Mips specific code was using an uninitialized variable.
(cherry picked from commit 2c68d380c9
)
Change-Id: I6b562b3f6d2084b72e747736cbf43684c2049f8e
2014-06-04 15:34:16 +01:00
Narayan Kamath
87947be618
Merge "Fix mips build for libbinder."
2014-06-04 14:32:59 +00:00
Narayan Kamath
2c68d380c9
Fix mips build for libbinder.
...
Mips specific code was using an uninitialized variable.
Change-Id: I445043c76ebfa420b26376ade60f8068b4ea0b11
2014-06-04 15:05:13 +01:00
Mark Salyzyn
b09b936d8e
am f0a24759: am a28750ee: Merge "binder: Turn on -Werror"
...
* commit 'f0a2475905786d5457e7af838ac714acbfdafa4f':
binder: Turn on -Werror
2014-06-03 20:54:48 +00:00
Mark Salyzyn
f0a2475905
am a28750ee: Merge "binder: Turn on -Werror"
...
* commit 'a28750eec38c848230adfeef28725b29cc36a9da':
binder: Turn on -Werror
2014-06-03 20:48:35 +00:00
Mark Salyzyn
a28750eec3
Merge "binder: Turn on -Werror"
2014-06-03 19:40:01 +00:00
Mark Salyzyn
d4ecccfd20
binder: Turn on -Werror
...
Change-Id: I0ee785927a7ae5f731b02176b0b781b87c22a24e
2014-06-03 11:11:45 -07:00
Eric Laurent
9882be8960
add sound trigger native service
...
Change-Id: I5d6fe1ecacca3a941317f841009322bafdf6adcd
2014-06-03 08:20:07 -07:00
Narayan Kamath
db1972bd8e
am 26063a91: am f1dd859b: Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"
...
* commit '26063a9155ddd18d858cea7fac7c1ddf71e1bcb7':
x86_64: Align uint64_t/int64_t structure member to 8 bytes
2014-06-03 13:58:40 +00:00
Narayan Kamath
26063a9155
am f1dd859b: Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"
...
* commit 'f1dd859baa114995bcbcfb7119e939d0b4f45ed5':
x86_64: Align uint64_t/int64_t structure member to 8 bytes
2014-06-03 13:29:00 +00:00
Narayan Kamath
f1dd859baa
Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"
2014-06-03 10:06:55 +00:00
Mark Salyzyn
edcf7f4d3a
binder: rm utils/Debug.h as unutilized
...
Change-Id: I52eb8b64b71cec7ffd4560e902daf358fda98b4a
2014-05-30 16:51:18 +00:00
Narayan Kamath
403ec9f15a
Fix flattening/unflattening of android::Sensor.
...
Write string lengths as uint32_t so that their width is
the same on 32 and 64 bit processes.
Note that this fixes another bug as a side effect; getFlattenedSize
was assuming that sizeof(uint32_t) == sizeof(size_t).
Change-Id: I7b6e3993e1f1ac45c14832ce59c59e0772855a2f
2014-05-30 14:40:13 +01:00
Fengwei Yin
83e0e425c6
x86_64: Align uint64_t/int64_t structure member to 8 bytes
...
To make sure the stature which pass between 32/64bit process have
same memory layout for 32/64bit.
Signed-off-by: Fengwei Yin <fengwei.yin@intel.com>
Co-Authored-by: Narayan Kamath <narayan@google.com> (Unit test only.)
Change-Id: I1bc2d12cce41ec0bc484adcaf968f274bec75c12
2014-05-30 14:13:29 +01:00
Mark Salyzyn
b8b3c536f4
am ea3f1da9: am 1ce5ecbe: am 63645c69: Merge "binder: rm utils/Debug.h"
...
* commit 'ea3f1da9013b33ecf3f3f8771393c1754a9aec59':
binder: rm utils/Debug.h
2014-05-29 21:09:57 +00:00
Brian Carlstrom
f1e77f1a99
am 823bcce3: am 4ae6a267: am f3e4fda0: Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
...
* commit '823bcce3abf536ee130a50551130d10589547cf4':
Remove dependencies on runtime_libdvm and libdvm.so in general
2014-05-29 21:09:39 +00:00
Mark Salyzyn
ea3f1da901
am 1ce5ecbe: am 63645c69: Merge "binder: rm utils/Debug.h"
...
* commit '1ce5ecbe3286380f5ff7ace289369ed006e9b40a':
binder: rm utils/Debug.h
2014-05-29 21:06:36 +00:00
Mark Salyzyn
1ce5ecbe32
am 63645c69: Merge "binder: rm utils/Debug.h"
...
* commit '63645c69e03cf3862c52cfde6cbd5f5143ccd38a':
binder: rm utils/Debug.h
2014-05-29 20:29:32 +00:00
Mark Salyzyn
63645c69e0
Merge "binder: rm utils/Debug.h"
2014-05-29 20:26:49 +00:00
Mark Salyzyn
317ff37cf7
binder: rm utils/Debug.h
...
Change-Id: I16931919a26c16a0d701771c93fa7fe1c6f60ef8
2014-05-29 13:10:03 -07:00
Brian Carlstrom
823bcce3ab
am 4ae6a267: am f3e4fda0: Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
...
* commit '4ae6a26719feb21b7fa1cc5f307b591858a30f26':
Remove dependencies on runtime_libdvm and libdvm.so in general
2014-05-29 19:43:02 +00:00
Brian Carlstrom
4ae6a26719
am f3e4fda0: Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
...
* commit 'f3e4fda09106cb93bddea35a2cc7dbd4b2c281e9':
Remove dependencies on runtime_libdvm and libdvm.so in general
2014-05-29 19:39:48 +00:00
Brian Carlstrom
f3e4fda091
Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"
2014-05-29 19:36:41 +00:00
Simon Wilson
7ef56b7315
am ad8d25e8: am 90654afb: Revert "Enable OMAP4 SGX workaround for OMAP3 too"
...
* commit 'ad8d25e812d8842298de92657158a0325c42cdbd':
Revert "Enable OMAP4 SGX workaround for OMAP3 too"
2014-05-29 17:58:30 +00:00
Simon Wilson
ad8d25e812
am 90654afb: Revert "Enable OMAP4 SGX workaround for OMAP3 too"
...
* commit '90654afb3aeac78916f2a53fe689a087c0e283c9':
Revert "Enable OMAP4 SGX workaround for OMAP3 too"
2014-05-29 17:54:34 +00:00
Brian Carlstrom
617f974e63
Remove dependencies on runtime_libdvm and libdvm.so in general
...
Bug: 14298175
(cherry picked from commit aefe55f0fb
)
Change-Id: I05b1a7dd1ef30b3366b52b46bfc7b39cfb3be198
2014-05-29 09:39:26 -07:00
Brian Carlstrom
5cd72e457e
am aefe55f0: Remove dependencies on runtime_libdvm and libdvm.so in general
...
* commit 'aefe55f0fb9e69be205497ef4fc3432d2f7a2d8b':
Remove dependencies on runtime_libdvm and libdvm.so in general
2014-05-29 16:37:18 +00:00
Simon Wilson
90654afb3a
Revert "Enable OMAP4 SGX workaround for OMAP3 too"
...
Since the new TI SGX DDK 1.12 has fixed support for RGBA8888,
the workaround can be reverted. This may help with CTS issues.
Bug: 14995811
This reverts commit 6e79cb81d0
.
Change-Id: Id8160ebe577d7009d2dd5eb4501ec40356a4274d
2014-05-29 08:55:27 -07:00
Brian Carlstrom
aefe55f0fb
Remove dependencies on runtime_libdvm and libdvm.so in general
...
Bug: 14298175
Change-Id: I74b4a3dabf89c6b53bfe688c45d6e1167880fd95
2014-05-28 21:27:47 -07:00
Elliott Hughes
3e54077d42
am e77cb931: am 259c2508: am 03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."
...
* commit 'e77cb9317de54ea0041eeef7966b818257158f64':
Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
2014-05-29 01:08:06 +00:00
Elliott Hughes
e77cb9317d
am 259c2508: am 03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."
...
* commit '259c25080d8b7f3b66e27e4d8ac3a268738ebe3f':
Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
2014-05-29 01:04:28 +00:00
Elliott Hughes
259c25080d
am 03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."
...
* commit '03e2f8fa13a791d744758ec9ffe27f52cab730d0':
Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
2014-05-29 01:02:16 +00:00
Elliott Hughes
03e2f8fa13
Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."
2014-05-29 00:59:01 +00:00
Brian Carlstrom
4b0af48a21
am 28ec0303: am e67810fd: am 97a51ad4: Merge "Move to dalvik.vm.lib.2 to force default to libart"
...
* commit '28ec03035d61828047f6bbc57be3b71f4c57b7fb':
Move to dalvik.vm.lib.2 to force default to libart
2014-05-28 23:18:49 +00:00
Brian Carlstrom
28ec03035d
am e67810fd: am 97a51ad4: Merge "Move to dalvik.vm.lib.2 to force default to libart"
...
* commit 'e67810fd7a00ffa92337c6f3aa6114136ce12613':
Move to dalvik.vm.lib.2 to force default to libart
2014-05-28 23:13:27 +00:00
Brian Carlstrom
e67810fd7a
am 97a51ad4: Merge "Move to dalvik.vm.lib.2 to force default to libart"
...
* commit '97a51ad44ae3dcf4976076382923ddcae16233ee':
Move to dalvik.vm.lib.2 to force default to libart
2014-05-28 22:31:43 +00:00
Brian Carlstrom
97a51ad44a
Merge "Move to dalvik.vm.lib.2 to force default to libart"
2014-05-28 22:28:41 +00:00
Brian Carlstrom
856bc78efc
Move to dalvik.vm.lib.2 to force default to libart
...
Bug: 14298175
(cherry picked from commit c4ac3124ff
)
Change-Id: I97cc3ff7a269e671b315afa8673dae43d1f86bf1
2014-05-28 14:48:36 -07:00
Brian Carlstrom
96d34ff2c3
am c4ac3124: Move to dalvik.vm.lib.2 to force default to libart
...
* commit 'c4ac3124ffb51f13bb4206e9f8452a3712eb09cb':
Move to dalvik.vm.lib.2 to force default to libart
2014-05-28 21:44:58 +00:00
Brigid Smith
750aa9743c
Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.
...
Bug: 15116468
Change-Id: I621532fb53b8317f5a513edfbeb0c50c265342fc
2014-05-28 14:42:09 -07:00
Brian Carlstrom
c4ac3124ff
Move to dalvik.vm.lib.2 to force default to libart
...
Bug: 14298175
Change-Id: Id3892a32848fb22fbf4c2861218b51f68e830b34
2014-05-28 14:31:47 -07:00
Dan Stoza
3d5c8a98c1
Merge "SurfaceFlinger: Add sourceCrop to screenshot"
2014-05-28 18:31:40 +00:00
Santos Cordon
7eb2a1566a
am 203fe88e: (-s ours) DO NOT MERGE Allow "telecomm" service to be registered with the phone UID.
...
* commit '203fe88ed8a47a370d07d69d14db2fb58f5a26ee':
DO NOT MERGE Allow "telecomm" service to be registered with the phone UID.
2014-05-28 18:20:13 +00:00
The Android Automerger
104513804e
am cfe99e79: merge in master-release history after reset to 102a072d90
...
* commit 'cfe99e79a6ae4d9fd08d09ecd66cee5da8a5fb95':
frameworks/native: Rename persist.sys.dalvik.vm.lib to allow new default
releax wait timeout on start of dumpstate service
2014-05-28 18:20:13 +00:00
Santos Cordon
203fe88ed8
DO NOT MERGE Allow "telecomm" service to be registered with the phone UID.
...
Change-Id: I9180797451dcb2e9029b20bed47f5d5cb8cddb9f
(cherry picked from commit 3fb4de7193
)
2014-05-28 04:50:04 +00:00
Jesse Hall
c2774f9b73
am 92374318: am 618c78c0: am dc273621: Merge "EGL: add x86/64 assembly code for EGL/GLES wrappers"
...
* commit '92374318b82945f3d03461f3d0c659adb8409fc5':
EGL: add x86/64 assembly code for EGL/GLES wrappers
2014-05-27 23:35:10 +00:00
Jesse Hall
92374318b8
am 618c78c0: am dc273621: Merge "EGL: add x86/64 assembly code for EGL/GLES wrappers"
...
* commit '618c78c032ce84c02724a1e5a7f439fa788ecf3a':
EGL: add x86/64 assembly code for EGL/GLES wrappers
2014-05-27 23:31:32 +00:00