159296 Commits

Author SHA1 Message Date
Olawale Ogunwale
cacf55647f am e3f85985: Merge "bindService can\'t start up service process"
* commit 'e3f859854712e96daf38d88b260afa8ac67a4e32':
  bindService can't start up service process
2015-01-12 16:26:52 +00:00
Olawale Ogunwale
a9ae505053 am 8ddd5f4c: Merge "[ActivityManager] Fix process record leakage."
* commit '8ddd5f4cd6e0619bbcf374ce073f4bc8acdbb182':
  [ActivityManager] Fix process record leakage.
2015-01-12 16:26:45 +00:00
Olawale Ogunwale
e3f8598547 Merge "bindService can't start up service process" 2015-01-12 13:44:35 +00:00
Olawale Ogunwale
8ddd5f4cd6 Merge "[ActivityManager] Fix process record leakage." 2015-01-12 13:44:17 +00:00
Lajos Molnar
d289a78c47 am 7f94b52f: Merge "MediaCodec/Image: handle null cropRect correctly"
* commit '7f94b52fc7c66bc40702b46f59b3929c076cbbfb':
  MediaCodec/Image: handle null cropRect correctly
2015-01-10 01:26:02 +00:00
Lajos Molnar
f3694fc139 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
2015-01-10 01:25:55 +00:00
Lajos Molnar
7f94b52fc7 Merge "MediaCodec/Image: handle null cropRect correctly" 2015-01-10 01:12:33 +00:00
Lajos Molnar
98840f2bd2 Merge "media: add support for 160-byte image info in MediaCodec" 2015-01-10 01:10:24 +00:00
Mathieu Chartier
117ba186d1 Merge "Call VMRuntime.clampGrowthLimit for small heap apps"
automerge: 9a6c45e

* commit '9a6c45eedd112313e5b24111f23bc309a3dc5df6':
  Call VMRuntime.clampGrowthLimit for small heap apps
2015-01-09 00:20:53 +00:00
Mathieu Chartier
9a6c45eedd Merge "Call VMRuntime.clampGrowthLimit for small heap apps" 2015-01-09 00:17:16 +00:00
Mathieu Chartier
24cee07160 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
2015-01-08 14:42:20 -08:00
Adam Lesinski
c04a21a0ef Merge "Fixup aapt usage message"
automerge: 64044d0

* commit '64044d0b7bc9aa46c60adcadce699d556e1c608e':
  Fixup aapt usage message
2015-01-08 20:18:38 +00:00
Adam Lesinski
64044d0b7b Merge "Fixup aapt usage message" 2015-01-08 20:15:39 +00:00
chad
7158ea25cd bindService can't start up service process
Issue 85758 https://code.google.com/p/android/issues/detail?id=85758

Change-Id: I28645445ee5c46b2ab4cf78189f143ea97df63dd
Signed-off-by: chad <guochongscut@gmail.com>
2015-01-08 14:12:40 +00:00
Jeff Sharkey
387da77697 Merge "check ntpserver as empty string instead of null"
automerge: dbcb4a1

* commit 'dbcb4a16d4c91d960359fbdb8c6f1d72a4daca9e':
  check ntpserver as empty string instead of null
2015-01-08 00:59:56 +00:00
Jeff Sharkey
dbcb4a16d4 Merge "check ntpserver as empty string instead of null" 2015-01-08 00:57:43 +00:00
Young-Ho Cha
0eda7dfcac 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>
2015-01-08 09:34:01 +09:00
Andreas Gampe
ec64c0b6e6 am 022b1ba1: Merge "Core/jni: Disallow relocation for decryption"
* commit '022b1ba188b249b0f17d1b5e8ab3badbc529f98e':
  Core/jni: Disallow relocation for decryption
2015-01-07 22:09:11 +00:00
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
e02fe5afac am c46d2a2d: Merge "camera2: Clarify the documentation on the ImageReader usecase"
* commit 'c46d2a2dca55da9ee54da5ba6b7473ee3addd51a':
  camera2: Clarify the documentation on the ImageReader usecase
2015-01-07 18:36:05 +00: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
bf31cb6be4 am 8371f2e3: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()."
* commit '8371f2e3fac04663dae2e5fb98dbce7e32325991':
  Check for OOM in BitmapFactory's getMimeTypeString().
2015-01-07 10:24:43 +00:00
Vladimir Marko
8371f2e3fa Merge "Check for OOM in BitmapFactory's getMimeTypeString()." 2015-01-07 10:20:50 +00:00
Johan Redestig
6ab7a7849c 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
2015-01-07 09:40:58 +01:00
Amith Yamasani
21735e222e am dcf323ad: Merge "NPE in SearchManager.triggerSearch"
* commit 'dcf323adaf3d59fb720dc534380090f9df3a618c':
  NPE in SearchManager.triggerSearch
2015-01-07 00:10:56 +00:00
Amith Yamasani
dcf323adaf Merge "NPE in SearchManager.triggerSearch" 2015-01-07 00:05:11 +00:00
Paul Lawrence
53d1022e83 am a15d6402: Merge "Fix crash caused by toHex returning exception"
* commit 'a15d6402cf4f99e448c7aaa69553483cdb18e0d4':
  Fix crash caused by toHex returning exception
2015-01-06 23:39:44 +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
d8aa4660b0 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
2015-01-06 16:50:56 +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
3787decd8d 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.
2015-01-06 10:10:09 +00:00
Narayan Kamath
f60b2d40b0 am 024191b5: Merge "Fix comment. It should be \'or\' not \'of\'."
* commit '024191b57f2165e4d0c2c579f95046d491feacb5':
  Fix comment.  It should be 'or' not 'of'.
2015-01-06 10:09:59 +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
riddle_hsu
22242ab29a [ActivityManager] Fix process record leakage.
Symptom:
Remain dead process record in mLruProcesses.

Root cause:
When a process dies and needs to restart immediately.
The process record will not be removed from mLruProcesses
in handleAppDiedLocked (return kept=true).
If the restarting process start timeout, the record in
mLruProcesses will not be removed.

Solution:
Call removeLruProcessLocked in processStartTimedOutLocked.

Change-Id: I1935ccc586016cb4e90dfdfac96cc88931553d5f
2015-01-06 02:31:06 +00:00
Robert Greenwalt
d38218d880 am b385e0b4: Merge "Telephony: Initialize GsmCellLocation class members properly"
* commit 'b385e0b4923e9bd4663e6b3c976fbff105b343c3':
  Telephony: Initialize GsmCellLocation class members properly
2015-01-05 23:33:37 +00:00
Robert Greenwalt
b385e0b492 Merge "Telephony: Initialize GsmCellLocation class members properly" 2015-01-05 23:28:23 +00:00
Narayan Kamath
dd65a4f735 am ea4cdd44: Merge "Race-condition in SoundPool during release"
* commit 'ea4cdd44541d76adea9b0b185740796d6cf6ac64':
  Race-condition in SoundPool during release
2015-01-05 18:02:32 +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
3d6cfe0eb1 am 873b291b: Merge "fix issuse 65774"
* commit '873b291b15c35ae1ec7ea29de4c012275e13e761':
  fix issuse 65774
2015-01-02 10:28:22 +00: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
d3d95172c3 am 38c2dae5: Merge "Remove hardcoded include paths."
* commit '38c2dae5f12003ff39a5b1a5e46f079174fcedca':
  Remove hardcoded include paths.
2014-12-31 10:13:23 +00:00
Narayan Kamath
38c2dae5f1 Merge "Remove hardcoded include paths." 2014-12-31 10:08:49 +00:00