132772 Commits

Author SHA1 Message Date
Jorim Jaggi
65e4a4ee30 am ed8b4ca0: Merge "Layout notifications on top and introduce artifical margin"
* commit 'ed8b4ca093d8aba40d29ef7ad701b28f8c313d97':
  Layout notifications on top and introduce artifical margin
2014-04-30 13:31:27 +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
29aa2f5645 am a6ffeb36: am ad85d542: am 293513a5: (-s ours) Merge commit \'0b62467b142b61ee1e449ba958ba37dfd961ef56\' into HEAD
* commit 'a6ffeb36ac36dd30c829c0316bbc7ddc3d4484e0':
  Update framework to use M33 Skia. DO NOT MERGE
2014-04-30 12:59:52 +00: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
cae15aa3b3 am 6609990e: Don\'t adjust ABI if PackageSetting#pkg is null.
* commit '6609990e35b11c38f55f6e632160d4f2ff201ea3':
  Don't adjust ABI if PackageSetting#pkg is null.
2014-04-30 12:42:33 +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
a17703ce4f am a6edd3ed: Merge "Explictly release the surface in TV input framework"
* commit 'a6edd3ed2caf732359ce1156f5881b5ab35f13cc':
  Explictly release the surface in TV input framework
2014-04-30 11:10:10 +00: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
c0b682b4ae am 51a6f925: Fix dex file pruning logic.
* commit '51a6f9253399588eedf77d75c578d9aa23d11529':
  Fix dex file pruning logic.
2014-04-30 10:10:46 +00:00
Narayan Kamath
037ebc9c7c am 85703d58: Adjust instruction sets for shared UID apps.
* commit '85703d58af1dac692d7d83c03220e45ab2a5aded':
  Adjust instruction sets for shared UID apps.
2014-04-30 10:10:43 +00:00
Narayan Kamath
0e4fa6ea7b am b4d35dc8: Package manager changes for dual zygote stack.
* commit 'b4d35dc8e9702f9d0d82d35a105f0eea35672b52':
  Package manager changes for dual zygote stack.
2014-04-30 10:10:40 +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
Narayan Kamath
64a48c5131 am a669e019: Merge "Create arch specific cache dirs during zygote startup."
* commit 'a669e019825a333a9a539f554c84c9f855654595':
  Create arch specific cache dirs during zygote startup.
2014-04-30 08:46:41 +00: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
John Spurlock
cee5dc7f2a am 8a479715: Merge "Zen mode tweaks."
* commit '8a479715185b7c5e6e2907ffbac8243429ce39a1':
  Zen mode tweaks.
2014-04-30 01:56:19 +00:00
John Spurlock
aa2112f671 Merge "Zen mode tweaks." 2014-04-30 01:53:09 +00: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
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
Deepanshu Gupta
1c78f4e2c0 am 9fb1a63b: am 4bf3c930: (-s ours) am 92bc0753: am 8c15cd0d: am c967d8dc: Add special system view cookie to OverflowButton. [DO NOT MERGE]
* commit '9fb1a63ba488212681460f2be2b7202581581f41':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
2014-04-30 00:48:28 +00: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
Joe Onorato
d2301cff83 am d66fd58b: Merge "Turn off this very verbose log."
* commit 'd66fd58b88dd37f69187b9ed6ff98ad52c8f0be7':
  Turn off this very verbose log.
2014-04-29 23:53:34 +00:00
Joe Onorato
016db94896 Merge "Turn off this very verbose log." 2014-04-29 23:50:29 +00:00
Deepanshu Gupta
c967d8dc62 Add special system view cookie to OverflowButton. [DO NOT MERGE]
Add a special view cookie to enable the IDE to identify the overflow
menu button in the Action Bar.

Change-Id: Ida3ed776afb8c9fa8af23b73d4cf6d47eef0ab87
(cherry picked from commit 674af92fd3a618695448ff88568b03390e90bc66)
2014-04-29 16:49:21 -07:00
Joe Onorato
8dc2e5a01a Turn off this very verbose log.
adb shell dumpsys activity broadcasts

has the last 100 broadcasts, so it can be used for debugging
instead of spamming the main logs.

Change-Id: I19c3ac72eb783999e615261da7f00b527d2bc06f
2014-04-29 23:26:46 +00:00
Guang Zhu
f0b5deb5a0 am 288b7143: am f0a3ea6e: am c6ebc0d1: Merge "make success explicit in BT instrumentation util" into klp-modular-dev
* commit '288b71436415687a4fdb4cb4f292aff2f8562beb':
  make success explicit in BT instrumentation util
2014-04-29 23:16:09 +00:00
Guang Zhu
dbe2aed24f am f0a3ea6e: am c6ebc0d1: Merge "make success explicit in BT instrumentation util" into klp-modular-dev
* commit 'f0a3ea6ea259f836c71007ab07966d9dd2a140d6':
  make success explicit in BT instrumentation util
2014-04-29 23:12:16 +00:00
Guang Zhu
f0a3ea6ea2 am c6ebc0d1: Merge "make success explicit in BT instrumentation util" into klp-modular-dev
* commit 'c6ebc0d120bd7faa61d2f906f4a180c720f1f0d8':
  make success explicit in BT instrumentation util
2014-04-29 23:09:12 +00:00
Bill Yi
293513a59d Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD 2014-04-29 16:07:29 -07:00
Guang Zhu
c6ebc0d120 Merge "make success explicit in BT instrumentation util" into klp-modular-dev 2014-04-29 23:06:39 +00:00
Nick Kralevich
9a980914cb am 1b1e58fe: am ab583454: am 1866e5dc: am af40649e: Merge "Set NO_NEW_PRIVS on zygote init"
* commit '1b1e58fe8268adcf581e64a24db71aa5a3d8dbaa':
  Set NO_NEW_PRIVS on zygote init
2014-04-29 22:37:58 +00:00
Nick Kralevich
d37ae7c13d am ab583454: am 1866e5dc: am af40649e: Merge "Set NO_NEW_PRIVS on zygote init"
* commit 'ab5834545da906f1a150672ead825c28a2e1f82a':
  Set NO_NEW_PRIVS on zygote init
2014-04-29 22:34:54 +00:00
Michael Wright
2eb2855183 am 801909b1: Merge "Move key attribute information into KeyEvent."
* commit '801909b10d91219e2c0a3b61117d83a51aec41e4':
  Move key attribute information into KeyEvent.
2014-04-29 22:34:07 +00:00
Michael Wright
15c32f2699 Merge "Move key attribute information into KeyEvent." 2014-04-29 22:31:06 +00:00
Nick Kralevich
ab5834545d am 1866e5dc: am af40649e: Merge "Set NO_NEW_PRIVS on zygote init"
* commit '1866e5dc8bb04b58a67e54f66cb4ec22e878667d':
  Set NO_NEW_PRIVS on zygote init
2014-04-29 22:26:41 +00:00
Nick Kralevich
1866e5dc8b am af40649e: Merge "Set NO_NEW_PRIVS on zygote init"
* commit 'af40649e4ad506e312b53518cd2b9f2b58dee3ba':
  Set NO_NEW_PRIVS on zygote init
2014-04-29 22:24:32 +00:00
Nick Kralevich
af40649e4a Merge "Set NO_NEW_PRIVS on zygote init" 2014-04-29 22:20:47 +00:00
Nick Kralevich
195c73c9b2 Set NO_NEW_PRIVS on zygote init
When app_process/zygote starts, make sure PR_SET_NO_NEW_PRIVS is set.
This prevents zygote spawned apps from acquiring new privileges
on exec.

In particular, this allows the CTS test
android.os.cts.SecurityFeaturesTest#testNoNewPrivs() to pass if ART is set
as the default runtime.

Change-Id: I81139cda999c7b1430242561aad28f566e9b6da0
2014-04-29 15:10:58 -07:00
Selim Cinek
3861e22805 am 011dee6f: Merge "Introduced basic animations for the new notifications."
* commit '011dee6f7c1990305ab3db223d507a814a1b59c8':
  Introduced basic animations for the new notifications.
2014-04-29 22:05:47 +00:00
Selim Cinek
0377b796d0 Merge "Introduced basic animations for the new notifications." 2014-04-29 22:03:17 +00:00
Selim Cinek
572bbd42a4 Introduced basic animations for the new notifications.
Animations between two different states of the notification stack scroller
are now possible.

Bug: 14081264
Change-Id: I2b8e964095f71766feac5a76c4e3b85d22648d35
2014-04-30 00:01:06 +02:00
Dianne Hackborn
1602ebde2d am 0c650605: Merge "Add IBatteryStats API to retrieve current charge times."
* commit '0c6506058f17f1be918ce3e5c7a7a1784cfb4633':
  Add IBatteryStats API to retrieve current charge times.
2014-04-29 21:58:28 +00:00
Dianne Hackborn
3e77bb8331 Merge "Add IBatteryStats API to retrieve current charge times." 2014-04-29 21:54:58 +00:00