159154 Commits

Author SHA1 Message Date
Andreas Gampe
022b1ba188 Merge "Core/jni: Disallow relocation for decryption" 2015-01-07 22:05:12 +00:00
neo.chae
155118fee8 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>
2015-01-07 13:28:36 -08:00
Narayan Kamath
c46d2a2dca Merge "camera2: Clarify the documentation on the ImageReader usecase" 2015-01-07 18:31:56 +00:00
Martin Storsjo
5c533e4fa0 camera2: Clarify the documentation on the ImageReader usecase
Uncompressed JPEG data is an oxymoron. Also mention the other
usecases for ImageReader.

Change-Id: I75261baf162a58c415705db99afa474c3826f900
2015-01-07 20:10:25 +02:00
Vladimir Marko
8371f2e3fa Merge "Check for OOM in BitmapFactory's getMimeTypeString()." 2015-01-07 10:20:50 +00:00
Amith Yamasani
dcf323adaf Merge "NPE in SearchManager.triggerSearch" 2015-01-07 00:05:11 +00:00
Paul Lawrence
a15d6402cf Merge "Fix crash caused by toHex returning exception" 2015-01-06 23:34:07 +00:00
Paul Lawrence
24063b5ebd 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
2015-01-06 15:09:49 -08:00
Vladimir Marko
7ab249a18e Check for OOM in BitmapFactory's getMimeTypeString().
Bug: 18909596
Change-Id: If65fe45f5fd569a99a0cae1d31117af262bca430
2015-01-06 18:40:08 +00:00
Olawale Ogunwale
da90a9c235 Merge "Do not allow the navigation bar to move if width == height" 2015-01-06 16:43:56 +00:00
Narayan Kamath
5137415e39 Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod." 2015-01-06 10:06:06 +00:00
Haitao Feng
8bd6a203ca 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
2015-01-06 09:57:13 +00:00
Narayan Kamath
024191b57f Merge "Fix comment. It should be 'or' not 'of'." 2015-01-06 09:46:17 +00:00
Robert Greenwalt
b385e0b492 Merge "Telephony: Initialize GsmCellLocation class members properly" 2015-01-05 23:28:23 +00:00
Narayan Kamath
ea4cdd4454 Merge "Race-condition in SoundPool during release" 2015-01-05 17:57:27 +00:00
Devin Kim
d7b12b44db 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>
2015-01-03 14:09:19 -08:00
Narayan Kamath
873b291b15 Merge "fix issuse 65774" 2015-01-02 10:22:21 +00:00
Paul Quei
65e37ee936 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>
2015-01-02 10:21:55 +00:00
Narayan Kamath
38c2dae5f1 Merge "Remove hardcoded include paths." 2014-12-31 10:08:49 +00:00
Narayan Kamath
bc2cc2f350 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
2014-12-31 10:06:51 +00:00
Narayan Kamath
72d33849fe Merge "Missing break in switch statement" 2014-12-30 09:43:03 +00:00
Narayan Kamath
5106dd44f9 Merge "Throw IllegalArgumentException on invalid hex-strings." 2014-12-29 16:08:34 +00:00
Narayan Kamath
5ae63a258b Merge "Fixed grammar in the comment that introduces the Debug.MemoryInfo class." 2014-12-29 12:08:58 +00:00
Srikanth Chintala
e4ec09da0b 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
2014-12-29 11:05:22 +00:00
Narayan Kamath
44a5a30a61 Merge "Fix "pm list permissions" crash if resource string missing" 2014-12-29 11:01:28 +00:00
Narayan Kamath
712a02050e Merge "Correct a mistyped word "MSG_SET_CLEINT" to "MSG_SET_CLIENT"" 2014-12-29 10:02:28 +00:00
Craig Mautner
cfa31a605c Merge "[ActivityManager] Reset ActivityRecord's waitingVisible" 2014-12-29 01:30:50 +00:00
Elliott Hughes
ee435b16d8 Merge "telephony: Update comments for preferred network mode" 2014-12-26 18:48:57 +00:00
Sungmin Choi
e099ab18e6 telephony: Update comments for preferred network mode
Change-Id: I4718674ff73116cc6bbec4540c3450ed14663c0d
2014-12-25 07:39:37 +00:00
Nick Kralevich
5e1e38ccdd Merge "Mods to the SELinuxMMAC engine code." 2014-12-23 19:42:06 +00:00
Robert Craig
2e1f052f45 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>
2014-12-23 18:30:31 +00:00
Narayan Kamath
d777176872 Merge "Build against libphonenumber-platform." 2014-12-23 13:33:45 +00:00
Andreas Gampe
2b20efa728 Merge "Core/jni: Remove Dalvik options from AndroidRuntime" 2014-12-23 03:29:46 +00:00
Andreas Gampe
08b2d585b1 Core/jni: Remove Dalvik options from AndroidRuntime
Dalvik is dead. Remove old command-line options from AndroidRuntime.

Bug: 18833580
Bug: 18834205
Change-Id: If9a6f78cc0d74fc7a596b08065059b388a8d4b2f
2014-12-22 14:57:18 -08:00
Olawale Ogunwale
4fa039dfb1 Merge "Layout the config-changed window if it has surface" 2014-12-19 15:30:39 +00:00
louis_chang
1110f55470 [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
2014-12-19 17:30:45 +08:00
Craig Mautner
6007d9aa5f Merge "Fix racing condition of mTouchExcludeRegion" 2014-12-19 06:41:27 +00:00
tingna_sung
33d8e73920 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>
2014-12-19 13:21:08 +08:00
tiger_huang
f73883f69d 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
2014-12-19 13:19:36 +08:00
Jeff Hao
e06184e4b1 Merge "Add mips64 support to app_process." 2014-12-18 19:18:54 +00:00
Alex Klyubin
ff35642e47 Merge "Remove DefaultHostnameVerifier from preloaded-classes." 2014-12-18 17:40:46 +00:00
Olawale Ogunwale
07bb03c423 Merge "Avoid deadlock between ActivityManagerService and ProcessStatsService." 2014-12-18 16:55:43 +00:00
Elliott Hughes
5cd79d0708 Merge "Move the remaining ZygoteInit native code over to Java." 2014-12-18 16:55:23 +00:00
Narayan Kamath
ddd11793a2 Build against libphonenumber-platform.
Don't compile libphonenumber sources directly.

Change-Id: Ib2efd84535a2cffe773271fd1ddcb66a6a651cb8
2014-12-18 13:26:03 +00:00
Douglas Leung
7e7c603182 Add mips64 support to app_process.
Change-Id: Ieb05a212606f02ebad119a0aea0ed92773ace214
2014-12-17 20:27:25 -08:00
Elliott Hughes
93241de734 Merge "Remove a bitrotted test." 2014-12-18 00:32:01 +00:00
Elliott Hughes
988fd73499 Remove a bitrotted test.
Change-Id: I4c44f2da0544dbfde8e340f7f477191725c5fb8b
2014-12-17 16:29:04 -08:00
Olawale Ogunwale
f62877d305 Merge "Prevent wrong system ui visibility callback after the user swipe" 2014-12-17 21:43:27 +00:00
Olawale Ogunwale
486a9942eb Merge "[ActivityManager] Use synchronized to protect object" 2014-12-17 21:42:44 +00:00
Elliott Hughes
26b56e628b Move the remaining ZygoteInit native code over to Java.
Bug: 18719692
Change-Id: I5f9834edecdbcc065a33a9921c740a53441636a4
2014-12-17 12:28:29 -08:00