159320 Commits

Author SHA1 Message Date
Narayan Kamath
2f7ae52809 am a747d5e4: Merge "Fix unexpected language changes on SIM card insertion."
* commit 'a747d5e47bef27acd18afda3ed43309ad5fab87b':
  Fix unexpected language changes on SIM card insertion.
2015-01-15 12:02:15 +00:00
Narayan Kamath
a747d5e47b Merge "Fix unexpected language changes on SIM card insertion." 2015-01-15 11:53:32 +00:00
Narayan Kamath
7dc8d32fd2 Fix unexpected language changes on SIM card insertion.
There are two separate issues here that need to be fixed, both
boil down to the fact that adding an imperative (userSetLocale)
to the Configuration is a bad idea. Because of this:

- We'd never persist the first user set configuration if it was en_US,
  because of an erroneous call to Configuration.setLocale.

- ActivityManager.getConfiguration would sometimes return a
  Configuration with userSetLocale == true, which means callers with
  the right permissions would inadvertently persist a locale they didn't
  want to persist.

bug: 18879010

(cherry picked from commit c63a16b8e46f2f3ecce6c548663cc3185f011fd6)

Change-Id: I4d714eb1f75afc0a5bf4d53a374df4ed16e328bf
2015-01-15 11:50:55 +00:00
Chad Brubaker
3d64a8508a am aa7a646e: Merge "Generate IKeystoreService using aidl"
* commit 'aa7a646eebb9b22d1421f8b09a09669bdb10d8b7':
  Generate IKeystoreService using aidl
2015-01-14 20:36:31 +00:00
Chad Brubaker
aa7a646eeb Merge "Generate IKeystoreService using aidl" 2015-01-14 20:31:29 +00:00
Chad Brubaker
7a2c973db7 Generate IKeystoreService using aidl
This replaces IKeystoreService.java with IKeystoreService.aidl and
changes the methods that passed down a byte[][] to instead pass down a
KeystoreArguments which is currently a thin parcelable wrapper around a byte[][].

Change-Id: I6367bcf57562f41a27aab14f1903b74995cb65c2
2015-01-13 18:29:15 -08:00
Greg Hackmann
96f7ac84b5 Merge "Find wall clock RTC through sysfs"
automerge: 41ef80e

* commit '41ef80e7ff739d863ea5df0e129e54f953545212':
  Find wall clock RTC through sysfs
2015-01-13 20:47:34 +00:00
Greg Hackmann
41ef80e7ff Merge "Find wall clock RTC through sysfs" 2015-01-13 20:43:36 +00:00
Greg Hackmann
0eb5826830 Find wall clock RTC through sysfs
Devices may have multiple RTCs.  By default the kernel uses rtc0 to
store the system time, but devices may override this (or even specify
that none of them should be used for system time).

Userspace can indirectly find the designated RTC through sysfs.  During
AlarmManagerService initialization, enumerate through all rtc class
devices to locate the device with attribute hctosys=1.

This is only done on devices without /dev/alarm, which has its own
in-kernel mechanism to pick the RTC.

Change-Id: Ife2b342c3590133ed316ddaf1799cbc1bfa6e6d9
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-01-13 12:16:56 -08:00
Craig Mautner
1e263d3f14 am 66b4d484: Merge "Prevent system server dump stuck by pipe buffer full."
* commit '66b4d48469c74f7dd889f3f685b436fcb957bf16':
  Prevent system server dump stuck by pipe buffer full.
2015-01-13 04:14:01 +00:00
Craig Mautner
66b4d48469 Merge "Prevent system server dump stuck by pipe buffer full." 2015-01-13 04:08:05 +00:00
Elliott Hughes
d6c475dc24 am 595ae39f: Merge "Use more intention-revealing tests for S_ISLNK and S_ISSOCK."
* commit '595ae39f7f484eb5d2d9e21feeff7e97114b744a':
  Use more intention-revealing tests for S_ISLNK and S_ISSOCK.
2015-01-13 01:18:48 +00:00
Elliott Hughes
595ae39f7f Merge "Use more intention-revealing tests for S_ISLNK and S_ISSOCK." 2015-01-13 01:13:00 +00:00
Elliott Hughes
1bf2481233 Use more intention-revealing tests for S_ISLNK and S_ISSOCK.
Change-Id: Ia7f13eb7d5a36cf2b4c0a253b2b4d7f7af396951
2015-01-12 14:33:04 -08:00
Yang Ni
cc9efb78fa am 21454aa2: Merge "New Script Group API."
* commit '21454aa27643f69a0ee9377ae09a01e96af3718f':
  New Script Group API.
2015-01-12 21:31:42 +00:00
Yang Ni
21454aa276 Merge "New Script Group API." 2015-01-12 21:25:13 +00:00
Neil Fuller
f5f345cf92 am 837261cc: Merge "Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade."
* commit '837261cc997cbb188de05e3d1194adb91cb75825':
  Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade.
2015-01-12 16:27:04 +00:00
Olawale Ogunwale
9d29391122 am ebdfb6e8: Merge "[ActivityManager] Distinguish FG or BG receiver finished"
* commit 'ebdfb6e8642e649f7efe877af398eae71cd9b80c':
  [ActivityManager] Distinguish FG or BG receiver finished
2015-01-12 16:26:58 +00:00
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
Neil Fuller
837261cc99 Merge "Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade." 2015-01-12 14:50:36 +00:00
Olawale Ogunwale
ebdfb6e864 Merge "[ActivityManager] Distinguish FG or BG receiver finished" 2015-01-12 13:45:13 +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
Neil Fuller
62d0677b0f Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade.
OkHttp recently changed the behavior of their caching with
commit e74e3f3bf744ef7f4d8ee724a7cf2347e486cfab - it is now
neccessary to close the inputstream (or disconnect the
HttpURLConnection) for a response to be cached.

This change is (effectively) a no-op prior to the upgrade.

The behavior is undefined as to whether closing the
input stream is required for caching. OkHttp's new behavior
is consistent with other HttpURLConnection implementations
tried.

Change-Id: Iaf57371651296ac84850971ef60a9338cead57c0
2015-01-09 11:50:50 +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
Yang Ni
281c325251 New Script Group API.
Change-Id: I73d3572276a38dac775025b472ba229ad8770c84
2015-01-07 15:07:16 -08: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