129626 Commits

Author SHA1 Message Date
Kenny Root
b3aa8f4804 resolved conflicts for merge of 3e320a0c to master
Change already in frameworks/native as commit
51eb29fa9a2ffe9c5adb9ea25bfbd51992ff16a4

Change-Id: I23ae58c86dac91efb5210fdc4f080a1d6fb741c3
2014-04-30 09:33:22 -07:00
Adrian Roos
a5956424b8 Fix broken trust agent reloading v2
Bug: 13723878
Change-Id: I61f313bfc7ff0dc502551b54d580a7ce8694f04d
2014-04-30 18:23:38 +02:00
Narayan Kamath
f53418931b Merge "Fix x86 build in app_process." 2014-04-30 15:59:08 +00:00
Adrian Roos
e2b2514342 Merge "Fix broken trust agent reloading" 2014-04-30 15:51:48 +00:00
Adrian Roos
81e046645d Fix broken trust agent reloading
Bug: 13723878
Change-Id: I2f7f3fad5685e5e57dcddf2f2c3494bb95e38b15
2014-04-30 17:48:18 +02:00
Narayan Kamath
6eb1b2611c Fix x86 build in app_process.
Look for __i386__ and not __x86__.

Change-Id: Iffa3709f9d0c96cce17f3183a6f036a78eccc787
2014-04-30 16:45:07 +01:00
Narayan Kamath
21ccb07fbe am 414d9405: am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"
* commit '414d94059f3559b67b4da25a34de6d5312abe06f':
  Cast CallVoidMethod's size_t parameters to jint
2014-04-30 15:37:58 +00:00
Narayan Kamath
516130ccb1 am dbbf431b: am d0f7f418: Merge "Freeing frame map"
* commit 'dbbf431b289bb7a01b43db3412ecab00abe18362':
  Freeing frame map
2014-04-30 15:37:44 +00:00
Narayan Kamath
414d94059f am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"
* commit '56cd8dbfbdeebc36ccbd5b2beedaaaa3f13c8b07':
  Cast CallVoidMethod's size_t parameters to jint
2014-04-30 15:13:02 +00:00
Narayan Kamath
dbbf431b28 am d0f7f418: Merge "Freeing frame map"
* commit 'd0f7f41828493b0679e908f7bb3ed3b8e838c463':
  Freeing frame map
2014-04-30 15:12:58 +00:00
George Mount
7f89c9b8e6 Merge "Fix NPE when going "back" from Activity Transition." 2014-04-30 14:27:31 +00:00
Jorim Jaggi
8f72e8967b Merge "NotificationRowLayout shall rest in its grave." 2014-04-30 13:53:02 +00:00
Jorim Jaggi
59c77fee17 NotificationRowLayout shall rest in its grave.
Long live the stack scroller. Also removed some other unused classes.

Change-Id: Iff126a0e74e13caadb6426d5e0e76ba800489d3f
2014-04-30 15:45:25 +02:00
Narayan Kamath
56cd8dbfbd Merge "Cast CallVoidMethod's size_t parameters to jint" 2014-04-30 13:34:04 +00:00
Jorim Jaggi
984f6b7519 Merge "Layout notifications on top and introduce artifical margin" 2014-04-30 13:28:17 +00:00
Jorim Jaggi
8c1a44b62f Layout notifications on top and introduce artifical margin
This allows for animating the notifications between the different
states. So we can nicely switch between Keyguard and full shade,
and make the stack smaller when going to quick settings.

Change-Id: I768dc7cd8f4dc0197365a5befebad24086816a8d
2014-04-30 15:25:56 +02:00
Bill Yi
8ec7d60cd2 am ad85d542: am 293513a5: (-s ours) Merge commit \'0b62467b142b61ee1e449ba958ba37dfd961ef56\' into HEAD
* commit 'ad85d5422b46a44e9a2166436c34c11e59d30e0c':
  Update framework to use M33 Skia. DO NOT MERGE
2014-04-30 12:51:01 +00:00
Narayan Kamath
ab45d1d6d2 Don't adjust ABI if PackageSetting#pkg is null.
If means the package hasn't been scanned yet, and we
will adjust the ABI during the scan of the last package
in the shared user group.

NOTE: This needs some more cleaning up, which will be
done along with the remaining TODO in this function.

Change-Id: Ie332806b64e22ab4a4856e1ccd064ff6a01616bf
2014-04-30 13:36:37 +01:00
Youngsang Cho
36c492cf1a Merge "Explictly release the surface in TV input framework" 2014-04-30 11:07:29 +00:00
Youngsang Cho
f836206818 Explictly release the surface in TV input framework
Change-Id: Id178e8959f9c25d1d5f1ab85d5e8455577570d11
2014-04-30 20:05:32 +09:00
Narayan Kamath
d0f7f41828 Merge "Freeing frame map" 2014-04-30 10:58:31 +00:00
Mykola Kondratenko
0c1eeb3c8a Freeing frame map
FileMap memory is never released until application exit

Release it now as the texture is already loaded and the memory
used for the packed resource can be released.

Change-Id: Id08a1e466337b3a0179684eb6a444e18147ee343
2014-04-30 10:58:20 +00:00
Narayan Kamath
f6b635e4f0 Fix dex file pruning logic.
We should now prune all normal files from /data/dalvik-cache
in addition to looking for dex files in all subdirectories of
/data/dalvik-cache.

Change-Id: I4abb2b01b359bbb1b8ece2c9025541a5d5e335f5
2014-04-30 10:30:12 +01:00
Allen Shen
1c0f21ea84 WallpaperManager: add NULL pointer check for getCropAndSetWallpaperIntent
Originally the api 'getCropAndSetWallpaperIntent' does not check
whether the parsed parameter is a NULL pointer, as leads to the
whole app crash if it call this api with a null parameter accidentally.
A null pointer check logic is added into its original parameter check
logic, so that this API will throw an IllegalArgumentException if it
is parsed with a null pointer

Change-Id: Ib7de40e571419d09e1a744edc969eb7162766b75
2014-04-30 17:09:19 +08:00
Narayan Kamath
df6d6dc2aa Adjust instruction sets for shared UID apps.
Since shared UID apps are run in the same process,
we'll need to make sure they're compiled for the same
instruction set.

This change implements the recompilation of apps that
don't have any ABI constraints.

Apps that *do* have ABI constraints are harder to deal
with, since we'll need to rescan them to figure out the
full list of ABIs they support and then re-extract the
native libraries from these apps once we find an ABI we
can use throughout.

Change-Id: I365c6b0b18187df814d4736da61b199dd4494e3c
2014-04-30 09:43:47 +01:00
Narayan Kamath
0f206a149d Package manager changes for dual zygote stack.
- Pass down the app's instruction set to dexopt so that
  it can compile the dex file for the right architecture.

- Also pass down the app's instruction set to rmdex, movedex
  and getSize so that they can construct the cache file
  location properly.

- Temporarily compile "system" jars such as am,wm etc. for
  both architectures. A follow up change will ensure that
  they're compiled only for one architecture (the same
  arch. as the system server).

- Java "shared" libraries are now compiled for the right
  architecture when an app requires them.

- Improve the app native library ABI detection to account
  for system apps installed in /system/lib{64}/<packagename>
  and also handle sdcard and forward locked apps correctly.

Change-Id: I4f380b146137803e51d56fdf355c3bdfc92c409d
2014-04-30 09:43:31 +01:00
Narayan Kamath
dfacf855fd Merge "Create arch specific cache dirs during zygote startup." 2014-04-30 08:34:56 +00:00
Narayan Kamath
d1e127e141 Create arch specific cache dirs during zygote startup.
The runtime expects them to exist before it's launched.
The boot image / art files are created during the first
zygote launch.

Change-Id: I5ed0ad4854dc7785246344c8f6eaf54e560feb7d
2014-04-30 09:26:05 +01:00
Deepanshu Gupta
4b5fa4d318 Fix class name for OverflowMenuButton [DO NOT MERGE]
Change-Id: Ie3e709e7aadb2193397df8befef0c55624d7e4e3
2014-04-29 19:37:09 -07:00
Bill Yi
d21082ca0c am 9a76e9ba: Fix build error
* commit '9a76e9ba1adbdf7cc431b1e6fe454cf0c5d900de':
  Fix build error
2014-04-30 01:55:23 +00:00
John Spurlock
aa2112f671 Merge "Zen mode tweaks." 2014-04-30 01:53:09 +00:00
Bill Yi
9a76e9ba1a Fix build error
Change-Id: I6f52954a780b747f1ad2a4e429ef192d58c40e76
2014-04-29 18:52:48 -07:00
John Spurlock
e86de4c067 Zen mode tweaks.
- Fix regression with alarms.
 - Run all condition provider callbacks on the main thread.
 - Exit zen mode if the current condition is disabled / uninstalled.

Bug:14402762
Change-Id: I0746670c1910047a9dc9b7e29aa1a6c3899fd9fe
2014-04-29 21:48:26 -04:00
Michael Wright
1e67bcec50 am 263c36a1: am ade631ee: Merge "NULL previous background bitmap upon changing wallpaper"
* commit '263c36a144a66d30dd51abd7ca0120480e449aa5':
  NULL previous background bitmap upon changing wallpaper
2014-04-30 01:24:32 +00:00
Michael Wright
263c36a144 am ade631ee: Merge "NULL previous background bitmap upon changing wallpaper"
* commit 'ade631eed0df228e343f2a00db653058ff588846':
  NULL previous background bitmap upon changing wallpaper
2014-04-30 01:22:05 +00:00
Michael Wright
bba434af67 am 10884694: am 357c75e7: Merge "Add missing character combinations for international layouts"
* commit '108846942f4296fa12b09dd70d60a21c69deace2':
  Add missing character combinations for international layouts
2014-04-30 01:19:56 +00:00
Michael Wright
3e320a0cac am 9feab5f2: am 8a02b20f: Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()"
* commit '9feab5f278d8c9e030e72989a7f6f3d2f376748d':
  Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()
2014-04-30 01:19:52 +00:00
Bill Yi
ad85d5422b am 293513a5: (-s ours) Merge commit \'0b62467b142b61ee1e449ba958ba37dfd961ef56\' into HEAD
* commit '293513a59d36cd96a3e474dde5981380d372d8c9':
  Update framework to use M33 Skia. DO NOT MERGE
2014-04-30 01:19:37 +00:00
Michael Wright
ade631eed0 Merge "NULL previous background bitmap upon changing wallpaper" 2014-04-30 01:19:10 +00:00
Dianne Hackborn
684bf34ee8 Switch IProcessObserver to report process state
When IProcessObserver was created, the only information
we had for the state of a process was its "importance".
Now we have the process state, which is much more useful.
Switch to reporting that.

Change-Id: Icdb3eea8cf96f4eff7ed3d584f940a1bd9cc3884
2014-04-29 17:56:57 -07:00
Deepanshu Gupta
b86e85600d am 4bf3c930: (-s ours) am 92bc0753: am 8c15cd0d: am c967d8dc: Add special system view cookie to OverflowButton. [DO NOT MERGE]
* commit '4bf3c930684b1e697c87d3fdb520309c39e51b14':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
2014-04-30 00:45:25 +00:00
Deepanshu Gupta
4bf3c93068 am 92bc0753: am 8c15cd0d: am c967d8dc: Add special system view cookie to OverflowButton. [DO NOT MERGE]
* commit '92bc07534e511b9afa7edaffe867d2674c504d73':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
2014-04-30 00:41:26 +00:00
Deepanshu Gupta
92bc07534e am 8c15cd0d: am c967d8dc: Add special system view cookie to OverflowButton. [DO NOT MERGE]
* commit '8c15cd0dc1d04490b82fd7d8da7611ff3219a1f0':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
2014-04-30 00:38:35 +00:00
Deepanshu Gupta
8c15cd0dc1 am c967d8dc: Add special system view cookie to OverflowButton. [DO NOT MERGE]
* commit 'c967d8dc62c429ecf3e27bf3714a953636e75cbf':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
2014-04-30 00:30:29 +00:00
Michael Wright
108846942f am 357c75e7: Merge "Add missing character combinations for international layouts"
* commit '357c75e74760933f05ff89352ee86dd540633782':
  Add missing character combinations for international layouts
2014-04-30 00:07:11 +00:00
Michael Wright
9feab5f278 am 8a02b20f: Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()"
* commit '8a02b20f6f3fdd5baa5d22321769303ce76ba80a':
  Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()
2014-04-30 00:03:29 +00:00
Michael Wright
357c75e747 Merge "Add missing character combinations for international layouts" 2014-04-30 00:01:38 +00:00
George Mount
d64616e8d2 Fix NPE when going "back" from Activity Transition.
Also fixed failure to start enter transition when shared element
and exit transition complete simultaneously.

Bug 14399938

Change-Id: Id0d4171f8cf94a30e47aee41ce68b4a25960f219
2014-04-29 16:58:42 -07:00
Michael Wright
8a02b20f6f Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()" 2014-04-29 23:58:17 +00:00
Joe Onorato
016db94896 Merge "Turn off this very verbose log." 2014-04-29 23:50:29 +00:00