OSDN Git Service
Lajos Molnar [Sat, 10 Jan 2015 01:25:55 +0000 (01:25 +0000)]
am
98840f2b: Merge "media: add support for 160-byte image info in MediaCodec"
* commit '
98840f2bd2fb96225ed5c95644937d55d4189ca6':
media: add support for 160-byte image info in MediaCodec
Lajos Molnar [Sat, 10 Jan 2015 01:10:23 +0000 (01:10 +0000)]
Merge "media: add support for 160-byte image info in MediaCodec"
Mathieu Chartier [Fri, 9 Jan 2015 00:20:53 +0000 (00:20 +0000)]
Merge "Call VMRuntime.clampGrowthLimit for small heap apps"
automerge:
9a6c45e
* commit '
9a6c45eedd112313e5b24111f23bc309a3dc5df6':
Call VMRuntime.clampGrowthLimit for small heap apps
Mathieu Chartier [Fri, 9 Jan 2015 00:17:15 +0000 (00:17 +0000)]
Merge "Call VMRuntime.clampGrowthLimit for small heap apps"
Mathieu Chartier [Thu, 8 Jan 2015 22:42:20 +0000 (14:42 -0800)]
Call VMRuntime.clampGrowthLimit for small heap apps
If the manifest doesn't specify large heaps, we now call
VMRuntime.clampGrowthLimit to release heap virtual address space
which won't ever get used.
Bug:
18387825
Bug:
17131630
Change-Id: I61fdcd70c70234256637eeebefe3abb22b91095d
Adam Lesinski [Thu, 8 Jan 2015 20:18:38 +0000 (20:18 +0000)]
Merge "Fixup aapt usage message"
automerge:
64044d0
* commit '
64044d0b7bc9aa46c60adcadce699d556e1c608e':
Fixup aapt usage message
Adam Lesinski [Thu, 8 Jan 2015 20:15:38 +0000 (20:15 +0000)]
Merge "Fixup aapt usage message"
Jeff Sharkey [Thu, 8 Jan 2015 00:59:56 +0000 (00:59 +0000)]
Merge "check ntpserver as empty string instead of null"
automerge:
dbcb4a1
* commit '
dbcb4a16d4c91d960359fbdb8c6f1d72a4daca9e':
check ntpserver as empty string instead of null
Jeff Sharkey [Thu, 8 Jan 2015 00:57:42 +0000 (00:57 +0000)]
Merge "check ntpserver as empty string instead of null"
Young-Ho Cha [Wed, 7 Jan 2015 02:24:35 +0000 (11:24 +0900)]
check ntpserver as empty string instead of null
mServer cannot set null, because string from resource always returns
non-null charsequence
Change-Id: I8d6a6fdbc34267ee361e7bd20719887268161870
Signed-off-by: Young-Ho Cha <ganadist@gmail.com>
Andreas Gampe [Wed, 7 Jan 2015 22:09:11 +0000 (22:09 +0000)]
am
022b1ba1: Merge "Core/jni: Disallow relocation for decryption"
* commit '
022b1ba188b249b0f17d1b5e8ab3badbc529f98e':
Core/jni: Disallow relocation for decryption
Andreas Gampe [Wed, 7 Jan 2015 22:05:11 +0000 (22:05 +0000)]
Merge "Core/jni: Disallow relocation for decryption"
neo.chae [Wed, 7 Jan 2015 06:32:15 +0000 (15:32 +0900)]
Core/jni: Disallow relocation for decryption
When decrypting a device, a tmpfs is temporarily mounted as /data,
the size of which is usually small. When the zygote, system server
and necessary apps are brought up, they will be compiled into the
tmpfs.
If the system image contains prebuilts, they will be relocated instead
of compiled. This is unnecessary. In this special situation it is
acceptable to run out of the prebuilt oat files without relocation,
which can save space in the tmpfs.
This patch ensures that the boot image is not being relocated.
Change-Id: I42bfb7e3039574b7e4f2772e0d395f093d59ed1b
Signed-off-by: Hyangseok Chae <neo.chae@lge.com>
Narayan Kamath [Wed, 7 Jan 2015 18:36:05 +0000 (18:36 +0000)]
am
c46d2a2d: Merge "camera2: Clarify the documentation on the ImageReader usecase"
* commit '
c46d2a2dca55da9ee54da5ba6b7473ee3addd51a':
camera2: Clarify the documentation on the ImageReader usecase
Narayan Kamath [Wed, 7 Jan 2015 18:31:55 +0000 (18:31 +0000)]
Merge "camera2: Clarify the documentation on the ImageReader usecase"
Martin Storsjo [Wed, 19 Nov 2014 09:58:03 +0000 (11:58 +0200)]
camera2: Clarify the documentation on the ImageReader usecase
Uncompressed JPEG data is an oxymoron. Also mention the other
usecases for ImageReader.
Change-Id: I75261baf162a58c415705db99afa474c3826f900
Vladimir Marko [Wed, 7 Jan 2015 10:24:43 +0000 (10:24 +0000)]
am
8371f2e3: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()."
* commit '
8371f2e3fac04663dae2e5fb98dbce7e32325991':
Check for OOM in BitmapFactory's getMimeTypeString().
Vladimir Marko [Wed, 7 Jan 2015 10:20:48 +0000 (10:20 +0000)]
Merge "Check for OOM in BitmapFactory's getMimeTypeString()."
Johan Redestig [Wed, 7 Jan 2015 08:24:39 +0000 (09:24 +0100)]
Fixup aapt usage message
The --preferred-configurations option was renamed to
--preferred-density in
fab5087 but only part of the
usage message was changed.
Change-Id: I89d270990023beca19605901d956d29d0b0b848b
Amith Yamasani [Wed, 7 Jan 2015 00:10:56 +0000 (00:10 +0000)]
am
dcf323ad: Merge "NPE in SearchManager.triggerSearch"
* commit '
dcf323adaf3d59fb720dc534380090f9df3a618c':
NPE in SearchManager.triggerSearch
Amith Yamasani [Wed, 7 Jan 2015 00:05:10 +0000 (00:05 +0000)]
Merge "NPE in SearchManager.triggerSearch"
Paul Lawrence [Tue, 6 Jan 2015 23:39:44 +0000 (23:39 +0000)]
am
a15d6402: Merge "Fix crash caused by toHex returning exception"
* commit '
a15d6402cf4f99e448c7aaa69553483cdb18e0d4':
Fix crash caused by toHex returning exception
Paul Lawrence [Tue, 6 Jan 2015 23:34:06 +0000 (23:34 +0000)]
Merge "Fix crash caused by toHex returning exception"
Paul Lawrence [Tue, 6 Jan 2015 21:11:23 +0000 (13:11 -0800)]
Fix crash caused by toHex returning exception
toHex was changed to throw an exception in
I4986a8e806d9066129f696ab9f2e80655424e723, but its caller was not adjusted
accordingly, causing a crash whenever an unencrypted device was booted.
Bug:
18886749
Change-Id: If0505f617001cf5e0d99cf14c8b09e6a6a377167
Vladimir Marko [Tue, 6 Jan 2015 18:17:52 +0000 (18:17 +0000)]
Check for OOM in BitmapFactory's getMimeTypeString().
Bug:
18909596
Change-Id: If65fe45f5fd569a99a0cae1d31117af262bca430
Olawale Ogunwale [Tue, 6 Jan 2015 16:50:56 +0000 (16:50 +0000)]
am
da90a9c2: Merge "Do not allow the navigation bar to move if width == height"
* commit '
da90a9c2355841bb98c2a669446b93ffe487a829':
Do not allow the navigation bar to move if width == height
Olawale Ogunwale [Tue, 6 Jan 2015 16:43:54 +0000 (16:43 +0000)]
Merge "Do not allow the navigation bar to move if width == height"
Narayan Kamath [Tue, 6 Jan 2015 10:10:09 +0000 (10:10 +0000)]
am
5137415e: Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod."
* commit '
5137415e391d8491d92535b17445ab646a3fcb5d':
Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.
Narayan Kamath [Tue, 6 Jan 2015 10:09:59 +0000 (10:09 +0000)]
am
024191b5: Merge "Fix comment. It should be \'or\' not \'of\'."
* commit '
024191b57f2165e4d0c2c579f95046d491feacb5':
Fix comment. It should be 'or' not 'of'.
Narayan Kamath [Tue, 6 Jan 2015 10:06:05 +0000 (10:06 +0000)]
Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod."
Haitao Feng [Wed, 31 Dec 2014 05:48:08 +0000 (13:48 +0800)]
Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.
CallStaticVoidMethod is varargs function, and calling it with
a literal 0 like CallStaticVoidMethod(..., 0) will treat the
argument as a 4 byte int in both 32 and 64 bit processes.
This is incorrect for pointer arguments where NULL should be
used instead.
Reviewed-by: Liao, Bruce <bruce.liao@intel.com>
Signed-off-by: Yong Yao <yong.yao@intel.com>
Change-Id: I9d700d3790a80dbee6826f64baf9ef5d81ca390f
Narayan Kamath [Tue, 6 Jan 2015 09:46:15 +0000 (09:46 +0000)]
Merge "Fix comment. It should be 'or' not 'of'."
Robert Greenwalt [Mon, 5 Jan 2015 23:33:37 +0000 (23:33 +0000)]
am
b385e0b4: Merge "Telephony: Initialize GsmCellLocation class members properly"
* commit '
b385e0b4923e9bd4663e6b3c976fbff105b343c3':
Telephony: Initialize GsmCellLocation class members properly
Robert Greenwalt [Mon, 5 Jan 2015 23:28:22 +0000 (23:28 +0000)]
Merge "Telephony: Initialize GsmCellLocation class members properly"
Narayan Kamath [Mon, 5 Jan 2015 18:02:32 +0000 (18:02 +0000)]
am
ea4cdd44: Merge "Race-condition in SoundPool during release"
* commit '
ea4cdd44541d76adea9b0b185740796d6cf6ac64':
Race-condition in SoundPool during release
Narayan Kamath [Mon, 5 Jan 2015 17:57:25 +0000 (17:57 +0000)]
Merge "Race-condition in SoundPool during release"
Devin Kim [Mon, 5 May 2014 21:34:58 +0000 (14:34 -0700)]
Do not allow the navigation bar to move if width == height
If width == height and mNavigationBarCanMove is true, the navigation bar
doesn't shows properly. Because wm doesn't know if the device is in landscape
mode or portrait mode.
Change-Id: I2077eacae50e6e498767f5c93b697e0459ad07fe
Signed-off-by: Devin Kim <dojip.kim@lge.com>
Narayan Kamath [Fri, 2 Jan 2015 10:28:22 +0000 (10:28 +0000)]
am
873b291b: Merge "fix issuse 65774"
* commit '
873b291b15c35ae1ec7ea29de4c012275e13e761':
fix issuse 65774
Narayan Kamath [Fri, 2 Jan 2015 10:22:20 +0000 (10:22 +0000)]
Merge "fix issuse 65774"
Paul Quei [Wed, 19 Mar 2014 07:18:54 +0000 (15:18 +0800)]
fix issuse 65774
"Some vendors have there own well defined specifications ...". Should be "Some vendors have their own well defined specifications ..."
Change-Id: I0d770ac0591812c1c61389eb0078493098784323
Signed-off-by: Paul Quei <paulquei@gmail.com>
Narayan Kamath [Wed, 31 Dec 2014 10:13:23 +0000 (10:13 +0000)]
am
38c2dae5: Merge "Remove hardcoded include paths."
* commit '
38c2dae5f12003ff39a5b1a5e46f079174fcedca':
Remove hardcoded include paths.
Narayan Kamath [Wed, 31 Dec 2014 10:08:47 +0000 (10:08 +0000)]
Merge "Remove hardcoded include paths."
Narayan Kamath [Tue, 30 Dec 2014 11:53:25 +0000 (11:53 +0000)]
Remove hardcoded include paths.
ICU, zlib & openssl export them using LOCAL_EXPORT_C_INCLUDE_DIRS.
The dependency on libc/dns/include was bogus and can be removed
trivially.
bug:
18581021
Change-Id: I4b8047ff0df1050ab48b61c0c886888b3f2f0c18
Narayan Kamath [Tue, 30 Dec 2014 12:20:56 +0000 (12:20 +0000)]
am
72d33849: Merge "Missing break in switch statement"
* commit '
72d33849fea5de45087bfa79e645fa282ce8fcef':
Missing break in switch statement
Narayan Kamath [Tue, 30 Dec 2014 09:43:00 +0000 (09:43 +0000)]
Merge "Missing break in switch statement"
Narayan Kamath [Mon, 29 Dec 2014 16:15:04 +0000 (16:15 +0000)]
am
5106dd44: Merge "Throw IllegalArgumentException on invalid hex-strings."
* commit '
5106dd44f9e5877aee8e70711c026e9e23783d4c':
Throw IllegalArgumentException on invalid hex-strings.
Narayan Kamath [Mon, 29 Dec 2014 16:08:32 +0000 (16:08 +0000)]
Merge "Throw IllegalArgumentException on invalid hex-strings."
Narayan Kamath [Mon, 29 Dec 2014 12:14:41 +0000 (12:14 +0000)]
am
5ae63a25: Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class."
* commit '
5ae63a258b78c4982a6c4ae984b86bb7b2db1dd4':
Fixed grammar in the comment that introduces the Debug.MemoryInfo class.
Narayan Kamath [Mon, 29 Dec 2014 12:08:56 +0000 (12:08 +0000)]
Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class."
Narayan Kamath [Mon, 29 Dec 2014 11:06:53 +0000 (11:06 +0000)]
am
44a5a30a: Merge "Fix "pm list permissions" crash if resource string missing"
* commit '
44a5a30a61e69b60f2f2b4b8884d28a0ec855f3a':
Fix "pm list permissions" crash if resource string missing
Srikanth Chintala [Sun, 21 Oct 2012 09:20:06 +0000 (02:20 -0700)]
Telephony: Initialize GsmCellLocation class members properly
Default values for class members mLac, mCid, mPsc would be 0.
Initialize these variables with -1 as 0 is considered as valid value.
CRs-Fixed: 406479
Change-Id: Idb3d1737c7101b97a90eab3dc7436ee1806d0bc4
Narayan Kamath [Mon, 29 Dec 2014 11:01:27 +0000 (11:01 +0000)]
Merge "Fix "pm list permissions" crash if resource string missing"
Narayan Kamath [Mon, 29 Dec 2014 10:07:13 +0000 (10:07 +0000)]
am
712a0205: Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT""
* commit '
712a02050e7be4479f12a81aeb23d7217b8d7a8d':
Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"
Narayan Kamath [Mon, 29 Dec 2014 10:02:26 +0000 (10:02 +0000)]
Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT""
Craig Mautner [Mon, 29 Dec 2014 01:44:25 +0000 (01:44 +0000)]
am
cfa31a60: Merge "[ActivityManager] Reset ActivityRecord\'s waitingVisible"
* commit '
cfa31a605cda26a556009ddd4eae83085e74339b':
[ActivityManager] Reset ActivityRecord's waitingVisible
Craig Mautner [Mon, 29 Dec 2014 01:30:49 +0000 (01:30 +0000)]
Merge "[ActivityManager] Reset ActivityRecord's waitingVisible"
Elliott Hughes [Fri, 26 Dec 2014 18:53:55 +0000 (18:53 +0000)]
am
ee435b16: Merge "telephony: Update comments for preferred network mode"
* commit '
ee435b16d89ee9cb65eead9ac7507693342c15b3':
telephony: Update comments for preferred network mode
Elliott Hughes [Fri, 26 Dec 2014 18:48:56 +0000 (18:48 +0000)]
Merge "telephony: Update comments for preferred network mode"
Sungmin Choi [Mon, 9 Jun 2014 05:45:51 +0000 (14:45 +0900)]
telephony: Update comments for preferred network mode
Change-Id: I4718674ff73116cc6bbec4540c3450ed14663c0d
Nick Kralevich [Tue, 23 Dec 2014 19:46:44 +0000 (19:46 +0000)]
am
5e1e38cc: Merge "Mods to the SELinuxMMAC engine code."
* commit '
5e1e38ccdd3da34f65a642dc25b5b2b5cf2b6059':
Mods to the SELinuxMMAC engine code.
Nick Kralevich [Tue, 23 Dec 2014 19:42:05 +0000 (19:42 +0000)]
Merge "Mods to the SELinuxMMAC engine code."
Robert Craig [Wed, 19 Nov 2014 18:56:10 +0000 (13:56 -0500)]
Mods to the SELinuxMMAC engine code.
* We now require that all certs used to sign the apk and all
certs stored with policy be tested for set equality. Prior
efforts required that the cert included with policy only
needed to match one of the certs included with an apk.
* Allowed a new tag to be included with policy describing the
signatures. <cert signature=""/> is now allowed as a child
element of the <signer> tag describing multiple certs. The
old way of describing signatures attached as attributes to
the root signer tag is still supported. The engine now treats
it the same as if they used the new layout with the outer
signature as the first signature value.
* Moved the class which holds all policy from an inner static
to a builder pattern governed by the Policy.PolicyBuilder
class. This will help provide more clarity and allow for
easier enforcement of certain invariants as the policy
representation is being built.
* Loads of new comments.
Change-Id: I38eb00ed8962fdef71bc9f2e7370cb910cadeff4
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Narayan Kamath [Tue, 23 Dec 2014 13:41:17 +0000 (13:41 +0000)]
am
d7771768: Merge "Build against libphonenumber-platform."
* commit '
d777176872792ed2a17f46acbd2f8ebc64ac1995':
Build against libphonenumber-platform.
Narayan Kamath [Tue, 23 Dec 2014 13:33:44 +0000 (13:33 +0000)]
Merge "Build against libphonenumber-platform."
Andreas Gampe [Tue, 23 Dec 2014 03:37:07 +0000 (03:37 +0000)]
am
2b20efa7: Merge "Core/jni: Remove Dalvik options from AndroidRuntime"
* commit '
2b20efa728f79ef9322930aefbbf0483a578ee74':
Core/jni: Remove Dalvik options from AndroidRuntime
Andreas Gampe [Tue, 23 Dec 2014 03:29:45 +0000 (03:29 +0000)]
Merge "Core/jni: Remove Dalvik options from AndroidRuntime"
Andreas Gampe [Thu, 18 Dec 2014 22:39:22 +0000 (14:39 -0800)]
Core/jni: Remove Dalvik options from AndroidRuntime
Dalvik is dead. Remove old command-line options from AndroidRuntime.
Bug:
18833580
Bug:
18834205
Change-Id: If9a6f78cc0d74fc7a596b08065059b388a8d4b2f
Olawale Ogunwale [Fri, 19 Dec 2014 15:37:11 +0000 (15:37 +0000)]
am
4fa039df: Merge "Layout the config-changed window if it has surface"
* commit '
4fa039dfb1a5a23dad493f3c8c2c7529ecc1e96d':
Layout the config-changed window if it has surface
Olawale Ogunwale [Fri, 19 Dec 2014 15:30:38 +0000 (15:30 +0000)]
Merge "Layout the config-changed window if it has surface"
louis_chang [Fri, 19 Dec 2014 09:30:45 +0000 (17:30 +0800)]
[ActivityManager] Reset ActivityRecord's waitingVisible
Symptom:
The ActivityRecord's waitingVisible is not set to false for
all cases when the ActivityRecord is removed from
mStackSupervisor.mWaitingVisibleActivities.
Solution:
Set the waitingVisible to false when it is removed from
mStackSupervisor.mWaitingVisibleActivities
Change-Id: If0f0683971d70a6866b0167e91dd95feebaac178
Craig Mautner [Fri, 19 Dec 2014 06:44:30 +0000 (06:44 +0000)]
Merge "Fix racing condition of mTouchExcludeRegion"
automerge:
6007d9a
* commit '
6007d9aa5f53685bba47ee63d6b4702b9f802744':
Fix racing condition of mTouchExcludeRegion
Craig Mautner [Fri, 19 Dec 2014 06:41:26 +0000 (06:41 +0000)]
Merge "Fix racing condition of mTouchExcludeRegion"
tingna_sung [Sat, 25 Oct 2014 13:32:40 +0000 (21:32 +0800)]
Fix racing condition of mTouchExcludeRegion
Copy region from DisplayContent.mTouchExcludeRegion instead of
directly refer to the same object of DisplayContent, and able to
protect it by lock of self class, don't have to lock out mWindowMap
on every tap.
This fix is to avoid racing condition of mTouchExcludeRegion.
Change-Id: I7401968167c2e539b4da2afe71e3020038fbfcbf
Signed-off-by: tingna_sung <tingna_sung@htc.com>
tiger_huang [Wed, 10 Dec 2014 08:26:17 +0000 (16:26 +0800)]
Layout the config-changed window if it has surface
This patch fixes an issue which caused the resumed app to get the
wrong frame at first.
https://code.google.com/p/android/issues/detail?id=82242
Change-Id: I4483029326afca143e7921f3b9563da4f566d2e5
Jeff Hao [Thu, 18 Dec 2014 20:25:39 +0000 (20:25 +0000)]
am
e06184e4: Merge "Add mips64 support to app_process."
* commit '
e06184e4b1f2228f404a3346b7355219b437c28a':
Add mips64 support to app_process.
Jeff Hao [Thu, 18 Dec 2014 19:18:53 +0000 (19:18 +0000)]
Merge "Add mips64 support to app_process."
Alex Klyubin [Thu, 18 Dec 2014 17:45:35 +0000 (17:45 +0000)]
am
ff35642e: Merge "Remove DefaultHostnameVerifier from preloaded-classes."
* commit '
ff35642e4732771a275e0ba8147af4a5d77f8419':
Remove DefaultHostnameVerifier from preloaded-classes.
Alex Klyubin [Thu, 18 Dec 2014 17:40:45 +0000 (17:40 +0000)]
Merge "Remove DefaultHostnameVerifier from preloaded-classes."
Olawale Ogunwale [Thu, 18 Dec 2014 17:00:07 +0000 (17:00 +0000)]
am
07bb03c4: Merge "Avoid deadlock between ActivityManagerService and ProcessStatsService."
* commit '
07bb03c42343d54d0a8eb609c74eebd9ecd0df9d':
Avoid deadlock between ActivityManagerService and ProcessStatsService.
Elliott Hughes [Thu, 18 Dec 2014 17:00:01 +0000 (17:00 +0000)]
am
5cd79d07: Merge "Move the remaining ZygoteInit native code over to Java."
* commit '
5cd79d070828b79d8b7d4ecdc3bdbf862866ac9a':
Move the remaining ZygoteInit native code over to Java.
Olawale Ogunwale [Thu, 18 Dec 2014 16:55:42 +0000 (16:55 +0000)]
Merge "Avoid deadlock between ActivityManagerService and ProcessStatsService."
Elliott Hughes [Thu, 18 Dec 2014 16:55:23 +0000 (16:55 +0000)]
Merge "Move the remaining ZygoteInit native code over to Java."
Narayan Kamath [Thu, 18 Dec 2014 13:26:03 +0000 (13:26 +0000)]
Build against libphonenumber-platform.
Don't compile libphonenumber sources directly.
Change-Id: Ib2efd84535a2cffe773271fd1ddcb66a6a651cb8
Douglas Leung [Thu, 18 Dec 2014 04:25:20 +0000 (20:25 -0800)]
Add mips64 support to app_process.
Change-Id: Ieb05a212606f02ebad119a0aea0ed92773ace214
Elliott Hughes [Thu, 18 Dec 2014 00:37:51 +0000 (00:37 +0000)]
am
93241de7: Merge "Remove a bitrotted test."
* commit '
93241de734c3b9cf20e8e8956e6f6ccacc5b5ef2':
Remove a bitrotted test.
Elliott Hughes [Thu, 18 Dec 2014 00:32:00 +0000 (00:32 +0000)]
Merge "Remove a bitrotted test."
Elliott Hughes [Thu, 18 Dec 2014 00:17:19 +0000 (16:17 -0800)]
Remove a bitrotted test.
Change-Id: I4c44f2da0544dbfde8e340f7f477191725c5fb8b
Olawale Ogunwale [Wed, 17 Dec 2014 21:47:45 +0000 (21:47 +0000)]
am
f62877d3: Merge "Prevent wrong system ui visibility callback after the user swipe"
* commit '
f62877d305d2da4876707137cefe0eaa1b2953c3':
Prevent wrong system ui visibility callback after the user swipe
Olawale Ogunwale [Wed, 17 Dec 2014 21:47:38 +0000 (21:47 +0000)]
am
486a9942: Merge "[ActivityManager] Use synchronized to protect object"
* commit '
486a9942ebc6e3efe04004afd759a53ab96517ec':
[ActivityManager] Use synchronized to protect object
Olawale Ogunwale [Wed, 17 Dec 2014 21:43:25 +0000 (21:43 +0000)]
Merge "Prevent wrong system ui visibility callback after the user swipe"
Olawale Ogunwale [Wed, 17 Dec 2014 21:42:43 +0000 (21:42 +0000)]
Merge "[ActivityManager] Use synchronized to protect object"
Elliott Hughes [Wed, 17 Dec 2014 20:28:29 +0000 (12:28 -0800)]
Move the remaining ZygoteInit native code over to Java.
Bug:
18719692
Change-Id: I5f9834edecdbcc065a33a9921c740a53441636a4
Elliott Hughes [Wed, 17 Dec 2014 18:26:33 +0000 (18:26 +0000)]
am
e6d63b94: Merge "Rewrite selectReadable JNI in Java."
* commit '
e6d63b94627d0072ff1468feca71698df1a0b64e':
Rewrite selectReadable JNI in Java.
Elliott Hughes [Wed, 17 Dec 2014 18:21:06 +0000 (18:21 +0000)]
Merge "Rewrite selectReadable JNI in Java."
Narayan Kamath [Wed, 17 Dec 2014 13:40:36 +0000 (13:40 +0000)]
Throw IllegalArgumentException on invalid hex-strings.
Beats returning null since there's let's chance it will be interpreted
as the lack of a password.
Change-Id: I4986a8e806d9066129f696ab9f2e80655424e723
Narayan Kamath [Wed, 17 Dec 2014 13:39:32 +0000 (13:39 +0000)]
am
6d41504d: Merge "Move frameworks users over to libcore hex encoding API."
* commit '
6d41504d2c2111a55a4c06dd6b183318efd7c598':
Move frameworks users over to libcore hex encoding API.
Narayan Kamath [Wed, 17 Dec 2014 13:33:59 +0000 (13:33 +0000)]
Merge "Move frameworks users over to libcore hex encoding API."
Tim Murray [Tue, 16 Dec 2014 21:36:43 +0000 (21:36 +0000)]
am
8de16999: Merge "Fix typo with register native allocation."
* commit '
8de169993f0078bfdd064499c48b9d124cb438be':
Fix typo with register native allocation.
Tim Murray [Tue, 16 Dec 2014 21:30:57 +0000 (21:30 +0000)]
Merge "Fix typo with register native allocation."
Ying Wang [Tue, 16 Dec 2014 20:50:58 +0000 (20:50 +0000)]
am
c80c12dd: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
* commit '
c80c12dda9c1ce11affdccb2923b2e570daacfcd':
Cleanup Obsolete LOCAL_PRELINK_MODULE.