174705 Commits

Author SHA1 Message Date
Shawn Willden
7714a9413f Add support for KM_TAG_USER_SECURE_ID.
Change-Id: I629ab2c47ee6d42de20a963ef283e330364c8ee7
2015-03-14 10:50:32 -06:00
Dmitriy Ivanov
9aeb080eec Merge "Switch libjnigraphics to sysv-only hash style" 2015-03-13 21:35:04 +00:00
Dmitriy Ivanov
ca4f2e838c Switch libjnigraphics to sysv-only hash style
Bug: 19059885
Change-Id: I3474974983931c67dce30dfc581a8d28d8b62e6a
2015-03-13 12:49:47 -07:00
Jeff Tinker
62632e25f5 Merge "Handle NULL keys and NULL values in MediaDrm JNI HashMap" 2015-03-13 18:20:43 +00:00
Nick Kralevich
30fcd2aa8a Merge "Drop unusable SELinux APIs." 2015-03-13 18:02:47 +00:00
Stephen Smalley
16d1cce8ff Drop unusable SELinux APIs.
setSELinuxEnforce is not allowed by policy.
get/setBooleanValue and getBooleanNames are moot since SELinux
policy booleans are forbidden by CTS.

Change-Id: I512953edd1c38828efce698ae8475603775c32e8
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
2015-03-13 14:09:26 -04:00
Chad Brubaker
f1654c6015 Merge "Add initial Keymaster 1.0 tests" 2015-03-13 17:48:09 +00:00
Mark Salyzyn
2018fd0251 logd: optimize statistics
logd reads /data/system/packages.xml (because it also contains
shared UIDs) and is sensitive to line break and tag name issues.

Bug: 19608965
Change-Id: I2a4a6bcfb10529e4b29c9664cbbf12842e689dd1
2015-03-12 20:29:32 +00:00
Olawale Ogunwale
53729e2933 Merge "Wait for opening apps ready before stopping freezing display" 2015-03-12 16:51:19 +00:00
Olawale Ogunwale
1b4933d10e Merge "Wait for visible wallpaper drawn before starting app transitions" 2015-03-12 16:22:07 +00:00
Lorenzo Colitti
1c24b3f110 Merge "Fix build, broken by https://android-review.googlesource.com/#/c/115890/" 2015-03-12 07:49:23 +00:00
Lorenzo Colitti
7b5be4c0c7 Fix build, broken by https://android-review.googlesource.com/#/c/115890/
Change-Id: Ieafa2fb0a7f539d8f933ad9c98e3be80457da6e5
2015-03-12 16:48:12 +09:00
Lorenzo Colitti
2f196e6c81 Merge "Remove dead code, mostly DataStateTracker." 2015-03-12 07:27:27 +00:00
Andreas Gampe
cdd3fb5cdb Merge "Extracted a separate class to run dexopt on packages" 2015-03-11 23:08:34 +00:00
Fyodor Kupolov
7487657ee9 Extracted a separate class to run dexopt on packages
performDexOptLibsLI and related methods were extracted to PackageDexOptimizer
class. Minor refactoring of PackageManagerService.

This is a non-functional change. It should simplify further work to allow
storing OAT files inside package dir.

(cherry picked from commit eeea67b8c3678d882d3774edc41242c63daa60fa)

Change-Id: I3494a2da70605362bb6fb4625ffbee1cbe1cd457
2015-03-11 16:03:41 -07:00
Jason Sams
d2e4a166eb Merge "Remove dead path code" 2015-03-11 20:55:08 +00:00
Marco Nelissen
a3d25d7489 Merge "Fix context leak" 2015-03-11 18:10:05 +00:00
Jason Sams
a7e2509d8d Remove dead path code
This API was never shipped and the implementation
never finished.

Change-Id: I2491db216d6a7a8ea30628d791773f89da5fb4d2
2015-03-11 11:00:00 -07:00
Marco Nelissen
926ebb860a Fix context leak
Using an activity context with AudioManager could cause that context
to be held on to longer than desired, for example if the caller
acquired audio focus but never abandoned it. Fix acquire/abandon in
VideoView, and use the application context in AudioManager to mitigate
the issue for other misbehaving code.

Bug: https://code.google.com/p/android/issues/detail?id=152173
Change-Id: I0fb8390207422c784800dda25b1f2c03d4574bcd
2015-03-11 10:00:28 -07:00
Paul Jensen
7fad4eb4b5 Remove dead code, mostly DataStateTracker.
Change-Id: I1433937bffdb29bd42fb1adbfcf0a50ceffac7dd
2015-03-11 10:03:58 -04:00
Craig Mautner
686947801e Merge "[ActivityManager] Fix index OOB when resetting removed task" 2015-03-11 13:46:38 +00:00
riddle_hsu
1d7919a7eb [ActivityManager] Fix index OOB when resetting removed task
Assume task T has an activity X lives in process P.
When P is died and before death recipient being called,
start activity with flag RESET_TASK_IF_NEEDED to bring the
existed task T.

Then scheduleResumeActivity IPC will fail and trigger start
a new process that removes task T.

That results resetTaskIfNeededLocked cannot find the task
when continuing the start flow.

Detail:
https://code.google.com/p/android/issues/detail?id=159558

Change-Id: Icc400c7a6c481a3f78657e9fb83cf0c3a17dde68
2015-03-11 17:09:50 +08:00
tiger_huang
4a7f8b99f8 Wait for visible wallpaper drawn before starting app transitions
If the opening app has wallpaper, when the closing app starts hiding,
the wallpaper would be revealed. It would be nice if we play the app
transitions while opening apps, closing apps, and visible wallpapers
are all drawn.

https://code.google.com/p/android/issues/detail?id=150811

Change-Id: I3c7d140f6f6e43e18119e48f9cab441ee96b17e5
2015-03-11 16:38:27 +08:00
Dimitry Ivanov
a6ed1b9547 am 6e116429: Merge "Generate gnu hash for arm only"
* commit '6e116429a8d48f9c8298f15c332cd29146694d8b':
  Generate gnu hash for arm only
2015-03-10 17:14:53 +00:00
Dimitry Ivanov
6e116429a8 Merge "Generate gnu hash for arm only" 2015-03-10 17:07:58 +00:00
Goran Jakovljevic
12f4749df8 Generate gnu hash for arm only
Fixes build failure caused by:
https://android-review.googlesource.com/#/c/139670/

As previously discussed [1], MIPS does not support GNU-style ELF hashes.

[1] https://android-review.googlesource.com/#/c/49282/2/tests/Android.mk

Change-Id: I8edb8a1595308db2ecd1bd6650a069b1224ae64f
2015-03-10 09:50:51 -07:00
Narayan Kamath
c2826fb922 am 3d333c74: Merge "Fix typos in AudioManager javadoc"
* commit '3d333c745f928ca1595aca111d9938fa3cf3e282':
  Fix typos in AudioManager javadoc
2015-03-10 15:23:06 +00:00
Dmitriy Ivanov
8ced035715 am 2a88ff2f: Merge "Generate sysv hash for libjnigraphics"
* commit '2a88ff2fe1849a3823962a2c239afdf6339fedc9':
  Generate sysv hash for libjnigraphics
2015-03-10 15:12:46 +00:00
Narayan Kamath
3d333c745f Merge "Fix typos in AudioManager javadoc" 2015-03-10 15:10:15 +00:00
Eemi Haukkala
bc68256fea Fix typos in AudioManager javadoc
The ACTION_HDMI_AUDIO_PLUG constant's description
had spelled "HDMI" as "HMDI" and was missing a
period. Fixes issue 93726.

Change-Id: Idfd5352dba022afcd81bc9e50864fc6e95c661db
Signed-off-by: Eemi Haukkala <eemi.haukkala@gmail.com>
2015-03-10 15:10:05 +00:00
Raju Yadav
aedae722fd systemui: Handle case when network has been lost
If the network is immediately lost after becoming
available the onAvailable callback may not yet
have finished and is working with a lost network.
In this case networkCapabilities may be null, so
handle that.

Change-Id: I588586ae0e844667cca4e2fd992d9694432a2198
2015-03-10 14:12:14 +00:00
tiger_huang
473db6fdfb Wait for opening apps ready before stopping freezing display
When the screen rotation is changing, we will freeze the display
until all the window surfaces are all drawn (this is not including
windows which have no surface). If the opening app's window surface
is created after we stop freezing the display, there would be no
waiting for the app, and the user would see the black screen.

In this change, we would not only wait for the windows which have
surface, but also wait for the windows about to have surface before
stopping freezing display.

https://code.google.com/p/android/issues/detail?id=150921

Change-Id: I7de4db8ca902236f3e9f730b04dbde681cf8c032
2015-03-10 21:10:40 +08:00
Dmitriy Ivanov
2a88ff2fe1 Merge "Generate sysv hash for libjnigraphics" 2015-03-10 04:41:35 +00:00
Dmitriy Ivanov
1dc91a5f7a Generate sysv hash for libjnigraphics
Bug: 19059885
Change-Id: I9b227fda6549e15a5ce50ac6b59250dff1371bb3
2015-03-09 19:42:16 -07:00
Andreas Gampe
174a44888e am 7f383873: Merge "Frameworks/base: Pass APK debugability to installd"
* commit '7f383873566024c7121cadae3bbdd2a7c47150bc':
  Frameworks/base: Pass APK debugability to installd
2015-03-10 02:10:22 +00:00
Andreas Gampe
7f38387356 Merge "Frameworks/base: Pass APK debugability to installd" 2015-03-09 22:14:54 +00:00
dcashman
db7fa51ff0 am c7446790: Merge "ZygoteConnection: remove obsolete security checks."
* commit 'c74467902b5a9a7267b6cb8f30b364b8373eac72':
  ZygoteConnection: remove obsolete security checks.
2015-03-09 20:51:33 +00:00
dcashman
c74467902b Merge "ZygoteConnection: remove obsolete security checks." 2015-03-09 20:46:17 +00:00
dcashman
fc4c0bf8bc ZygoteConnection: remove obsolete security checks.
SELinux guarantees that only the system_server and permissive domains such as su
are allowed to connect to the zygote socket. Remove obsolete security checks
that were only applicable when other processes could connect.

Bug: 19624279
Change-Id: I1c925d7facf19b3953b5deb85d992415344c4c9f
2015-03-09 12:37:08 -07:00
Elliott Hughes
6291beddfc am 63d43949: Merge "Use the icu:: namespace for icu4c API."
* commit '63d43949047eaed1cddf10bb4f666df6807618ce':
  Use the icu:: namespace for icu4c API.
2015-03-09 18:20:42 +00:00
Elliott Hughes
63d4394904 Merge "Use the icu:: namespace for icu4c API." 2015-03-09 18:10:24 +00:00
Olawale Ogunwale
edc3c8939f am 14ccc26f: Merge "[ActivityManager] Skip receiver precisely."
* commit '14ccc26f1ce006963f1a0b7a917404aa6a0e9da1':
  [ActivityManager] Skip receiver precisely.
2015-03-09 16:36:31 +00:00
Olawale Ogunwale
14ccc26f1c Merge "[ActivityManager] Skip receiver precisely." 2015-03-09 16:30:52 +00:00
Andreas Gampe
735600c1e6 Frameworks/base: Pass APK debugability to installd
Change-Id: Id17ec72babe2ee88713a0d274eff86508de30666
2015-03-09 08:57:23 -07:00
Elliott Hughes
4c5806b6b4 Use the icu:: namespace for icu4c API.
The icu guys recommend working this way, though it's not the default.
Internally Google makes this the default, and I've switched libcore
over.

Bug: 15350832
Change-Id: I038e12bea58dd089a46d0e681b5ab76cfc19d7b9
2015-03-07 11:00:50 -08:00
Andreas Gampe
5596600697 am 7a4cb563: Merge "Frameworks/base: Remove unnecessary Pattern instance"
* commit '7a4cb563a29f05658760739d3bc2e70bd6342174':
  Frameworks/base: Remove unnecessary Pattern instance
2015-03-07 17:13:16 +00:00
Andreas Gampe
a3d5b2304c am cdc19f3f: Merge "Frameworks/base: Remove unnecessary Pattern instance"
* commit 'cdc19f3f8a20b975e8e70f4b4cce5ce2be811726':
  Frameworks/base: Remove unnecessary Pattern instance
2015-03-07 17:13:09 +00:00
Andreas Gampe
7a4cb563a2 Merge "Frameworks/base: Remove unnecessary Pattern instance" 2015-03-07 01:03:14 +00:00
Andreas Gampe
055678b5fe Frameworks/base: Remove unnecessary Pattern instance
Using a static Pattern in UriMatcher prevents compile-time
initialization.

It is also not efficient, as String.split has a fast path for simple
splits.

Bug: 19542228

Change-Id: Ie9e5bfe6da04c6d05ec10b1426d0cd136ef46ef2
2015-03-07 00:19:01 +00:00
Andreas Gampe
cdc19f3f8a Merge "Frameworks/base: Remove unnecessary Pattern instance" 2015-03-07 00:18:45 +00:00