drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
119,422 Commits 1 Branch 0 Tags
Commit Graph

119422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
15b13a792c Add a config override for ViewConfiguration#hasPermanentMenuKey 
Allow device overlays to override the behavior of the
hasPermanentMenuKey method at build time. This is useful for devices
that do not behave as the usual autodetection mechanism expects.

Device overlays should set config_overrideHasPermanentMenuKey to 1 if
the device DOES have a permanent menu key or 2 if the device DOES NOT
have a permanent menu key.

Bug 11698700

Change-Id: I467b68528cf681b08adcaebc2402d8bdd84f6b5c
 2014-03-11 21:20:13 +00:00
Narayan Kamath
52af2ca919 DO NOT MERGE - Remove data dirs if a new install fails dexopt. 
We'd otherwise leave the data dirs & native libraries
lying around. This will leave the app permanently broken
because the next install of the app will fail with
INSTALL_FAILED_UID_CHANGED.

Also remove an unnecessary instance variable.

Cherry-pick from master
Bug 13416059

Change-Id: I1e644aab74d5ea519231800915b39c2f55d043ae
 2014-03-11 14:06:55 -07:00
Naofumi Harada
68c0346b22 DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted 
Since Kitkat, an app pre-loaded under /system/priv-app/ has
FLAG_PRIVILEGED. However, if the app updated and the device
rebooted, privileged flag is unset from pkgFlags. This patch
fix issue to assign privileged flag when scanning the updated
packages.

Bug: 12640283

Cherrypick from master.

Change-Id: I833d94cd911693c9291e8204f63bd8de945dbba6
 2014-03-11 12:26:21 -07:00
Chad Brubaker
7fb0743893 am 674f85af: Merge "Only allow System apps to make VPN exempt routes" into klp-dev 
* commit '674f85af4c04970ec8875669b3f08eaf0465ba4b':
  Only allow System apps to make VPN exempt routes
 2014-03-11 19:22:43 +00:00
Chad Brubaker
1011960c44 am decfd707: Merge "Add the calling package name to requestRouteToHost" into klp-dev 
* commit 'decfd7079b622f9135aeb8f7b2ec48005c844c38':
  Add the calling package name to requestRouteToHost
 2014-03-11 19:22:39 +00:00
Brian Carlstrom
a77df79c17 am ec4c7752: am ab97d617: Merge "Only pass -Xprofile-* options to ART" 
* commit 'ec4c7752c22ae26924378d953a6f4a0e8e8b036d':
  Only pass -Xprofile-* options to ART
 2014-03-11 18:52:23 +00:00
Narayan Kamath
a742ca4017 am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic." 
* commit 'bbf826659e8e5d0be683b2459207c495303d53b6':
  LP64: Make 9 patches architecture agnostic.
 2014-03-11 18:52:07 +00:00
Dave Allison
2fddd6cd2e am b94904ab: am 3fc3b9fd: Merge "ART profiler usage." 
* commit 'b94904ab6dfbb9db7e8042f10886042a295857d4':
  ART profiler usage.
 2014-03-11 18:51:42 +00:00
Narayan Kamath
762dda6d9e am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit" 
* commit '51ec4ec51f88d854b182547405e37f3ae74c35bd':
  Don't assume that size_t is 32-bit
 2014-03-11 18:42:36 +00:00
Narayan Kamath
143528fc91 am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store uint32_t value" 
* commit '6ac6263dcc55a4a93647cc1307c901a01c06d89c':
  Don't use size_t for variables that store uint32_t value
 2014-03-11 18:42:33 +00:00
Narayan Kamath
59ed568fa5 am cd4874cf: am d265bcc4: Merge "Inform libcore of time format pref. changes." 
* commit 'cd4874cfdc00d17454529b5dca85a487c7c2de77':
  Inform libcore of time format pref. changes.
 2014-03-11 18:42:30 +00:00
Martijn Coenen
1aa5595467 am 1507c18f: am 29e55bef: Merge "NFC: getNdefMessage() should throw exception if no tag in field." 
* commit '1507c18f87da9906337237d34184d6ac8f1afabd':
  NFC: getNdefMessage() should throw exception if no tag in field.
 2014-03-11 18:36:17 +00:00
Jason Sams
6660f55a33 am 9a9916b5: am 2383f220: Merge "Validate objects are from the correct context." 
* commit '9a9916b58fb22da735d18a03beffb24b4d5cd9a3':
  Validate objects are from the correct context.
 2014-03-11 18:30:05 +00:00
David 'Digit' Turner
73e5582cf2 am 9c6f41e3: am be7b8f4f: Merge "aidl: Support building with updated host sysroot." 
* commit '9c6f41e3eb2258d52480be04dd8916a10f8be8db':
  aidl: Support building with updated host sysroot.
 2014-03-11 18:29:59 +00:00
Brian Carlstrom
2d0bd7d36b am 485e3b45: am 5c126c3d: Merge "Add dex2oat-flags plumbing to AndroidRuntime" 
* commit '485e3b459491267ae1390e1df5ff8f7d4695f819':
  Add dex2oat-flags plumbing to AndroidRuntime
 2014-03-11 18:29:52 +00:00
Dave Platt
eed63ad6be am 7d8262cb: am 22f66b76: Merge "Harden NsdManager against null-dereference crashes" 
* commit '7d8262cb554c41892794f23b92e01b52458288bb':
  Harden NsdManager against null-dereference crashes
 2014-03-11 18:29:34 +00:00
Craig Mautner
d1d1fb6d37 am 7a93aa2f: am a0b4d0ce: Merge "Avoid duplication of AppWindowToken in created Task" 
* commit '7a93aa2fc2555b0de41bb5f30eb0e9cce2413084':
  Avoid duplication of AppWindowToken in created Task
 2014-03-11 18:29:09 +00:00
Victoria Lease
544d696576 am 3ce2b57d: am 9404752d: Merge "Add casual/cursive/sans-serif-smallcaps font families." 
* commit '3ce2b57d15d4afe330b728c3175b8bfb89c6890a':
  Add casual/cursive/sans-serif-smallcaps font families.
 2014-03-11 18:28:41 +00:00
Tim Murray
e1b6ab427c am fb51a430: am 8377a4fd: Merge "Fix null check for BaseObj.equals." 
* commit 'fb51a4301c8dc4d8ba1b6f84b55a76ec88d683dc':
  Fix null check for BaseObj.equals.
 2014-03-11 18:28:31 +00:00
Ying Wang
c9f8aa0cb4 am 26026c62: am dd72b6e7: Merge "Fix indirect misuse of ." 
* commit '26026c62788f508f9de0df608dd7043e7d1399f6':
  Fix indirect misuse of $(my-dir).
 2014-03-11 18:17:41 +00:00
Nick Kralevich
968173968f am 787d8145: am 4a794846: Merge "Fix descriptor leak after accepting connections" 
* commit '787d81453ce1e5451bd2c289c8b53cfeda2eab29':
  Fix descriptor leak after accepting connections
 2014-03-11 18:17:17 +00:00
Narayan Kamath
2d895e6344 am 8fb22ae7: am eee2c72f: Merge "Various format string fixes for 64bit" 
* commit '8fb22ae772fc62a10db6a06f283140d9233e8704':
  Various format string fixes for 64bit
 2014-03-11 18:16:59 +00:00
Narayan Kamath
3489aa9a0d am d138029d: am 14420e29: Merge "AArch64: Use long[] for RS id array" 
* commit 'd138029d92e1d4657815747f30004323061d34de':
  AArch64: Use long[] for RS id array
 2014-03-11 18:16:52 +00:00
Xavier Ducrohet
1767ea649c am 5e5602da: am 0c72b769: Merge "Update layoutlib method for SystemClock" 
* commit '5e5602da5fa9cd2e1d135b2310af2a8352f65e8d':
  Update layoutlib method for SystemClock
 2014-03-11 18:16:42 +00:00
Christopher Tate
3b0b00c62d am 41bfe121: am 16678ac6: Merge "Fixed upgrading from forward-lock application to system application" 
* commit '41bfe121cfa889df803a8916000e1fd0fbe87d5a':
  Fixed upgrading from forward-lock application to system application
 2014-03-11 18:16:38 +00:00
Narayan Kamath
30420d58e2 am 2525acf5: am e4dae5f2: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY" 
* commit '2525acf5a9855d748c008268bb26d6f6d5045d84':
  AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
 2014-03-11 18:16:20 +00:00
Narayan Kamath
9a25b94430 am f61add84: am 2000fe58: Merge "Make getAssetInt throw unconditionally." 
* commit 'f61add84c28be06c190d5594a41a7ef84b7666fe':
  Make getAssetInt throw unconditionally.
 2014-03-11 18:16:17 +00:00
Chris Craik
71be6865b9 am 59ff85af: (-s ours) am 2729857d: (-s ours) Merge "Fix AOSP build - DO NOT MERGE" 
* commit '59ff85af314e2984068943f5572ac40ef381edea':
  Fix AOSP build - DO NOT MERGE
 2014-03-11 18:08:14 +00:00
Chris Craik
fa03b57295 am 7b4cce68: am c3bac8a0: Merge "Fix graphics corruption caused by HWUI caches" 
* commit '7b4cce68853d8bcfce2b6bd7f999915063eb56d2':
  Fix graphics corruption caused by HWUI caches
 2014-03-11 18:08:10 +00:00
Chad Brubaker
a1d7c74449 Remove SO_BINDTODEVICE from VPN protect 
SO_BINDTODEVICE is not needed with policy routing.
SO_BINDTODEVICE was also used on the default iface which causes problems
when the default iface is IPv6 only and the socket tries to connect to a
IPv4 address.

Bug: 12940882
Change-Id: I5b2bde0ac5459433fc5749f509072a548532f730
 2014-03-11 10:58:19 -07:00
Chad Brubaker
674f85af4c Merge "Only allow System apps to make VPN exempt routes" into klp-dev 2014-03-11 17:51:50 +00:00
Chad Brubaker
decfd7079b Merge "Add the calling package name to requestRouteToHost" into klp-dev 2014-03-11 17:51:45 +00:00
Christopher Tate
87503f8561 am e9821bf2: Merge "DO NOT MERGE - Don\'t hang installs if the transport disappears" into klp-dev 
* commit 'e9821bf2380bfa325e6398a6390a4083007d3006':
  DO NOT MERGE - Don't hang installs if the transport disappears
 2014-03-11 17:37:06 +00:00
Baligh Uddin
c6ccb8a3d4 am 7138395b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '7138395b26fcad9664ad05b9c98109f60db8a557':
  Import translations. DO NOT MERGE
 2014-03-11 17:37:03 +00:00
Christopher Tate
e9821bf238 Merge "DO NOT MERGE - Don't hang installs if the transport disappears" into klp-dev 2014-03-11 17:34:15 +00:00
Baligh Uddin
7138395b26 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-03-11 17:33:28 +00:00
Narayan Kamath
b071a07da8 am a79af364: Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)." 
* commit 'a79af3647f7f93825b84cc25187527b5aac60a69':
  Remove java.io.tmpdir assignment in AndroidRuntime (again).
 2014-03-11 08:14:26 -07:00
Narayan Kamath
a79af3647f Merge "Remove java.io.tmpdir assignment in AndroidRuntime (again)." 2014-03-11 15:09:45 +00:00
Narayan Kamath
b3802a8e23 Remove java.io.tmpdir assignment in AndroidRuntime (again). 
This was brought back by a bad merge conflict resolution
in change 0efbd9a463c848118c7685f4bfc8765a82caa761.

Change-Id: I0c7cbe8ee396293619eabf4d0a3c2f06c76bdd6e
 2014-03-11 15:02:10 +00:00
Narayan Kamath
194e77aafe am 0f3fd6c6: Merge "Remove stray logging statement." 
* commit '0f3fd6c66e8376e62ed61dd2b92ea4807571b3de':
  Remove stray logging statement.
 2014-03-11 05:03:36 -07:00
Narayan Kamath
0f3fd6c66e Merge "Remove stray logging statement." 2014-03-11 12:00:55 +00:00
Narayan Kamath
c3955e7e5a Remove stray logging statement. 
bug: https://code.google.com/p/android/issues/detail?id=66974
Change-Id: Ie34c102de143cf6aeb16c78778dda3ef5e928380
 2014-03-11 11:08:41 +00:00
Alan Viverette
9ebe031cdc am 6e6dc23c: Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev 
* commit '6e6dc23c692b14f5e70ee1453eab726978e4984e':
  DO NOT MERGE Quick fix for updating the FastScroller long list property
 2014-03-11 02:15:26 +00:00
Alan Viverette
7b09a4e5df am e910a7ce: Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev 
* commit 'e910a7ce8b42580b8bc184dfc340859a65e98c80':
  DO NOT MERGE Check item type before re-binding transient state views
 2014-03-11 02:15:24 +00:00
Alan Viverette
3c3377a229 am 6a5b7c6f: Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev 
* commit '6a5b7c6ffbef87c6591dbc8f5813f61b3086bfad':
  DO NOT MERGE Ensure transient state views are temporarily detached
 2014-03-11 02:15:21 +00:00
Alan Viverette
6e6dc23c69 Merge "DO NOT MERGE Quick fix for updating the FastScroller long list property" into klp-dev 2014-03-11 02:12:13 +00:00
Alan Viverette
e910a7ce8b Merge "DO NOT MERGE Check item type before re-binding transient state views" into klp-dev 2014-03-11 02:12:05 +00:00
Alan Viverette
6a5b7c6ffb Merge "DO NOT MERGE Ensure transient state views are temporarily detached" into klp-dev 2014-03-11 02:11:58 +00:00
Adam Powell
75958c2984 am 3a153c0d: Merge "Fix a bug in submenu presenter priority handling" into klp-dev 
* commit '3a153c0de271a004710e5ac545c48778f7e51b12':
  Fix a bug in submenu presenter priority handling
 2014-03-11 01:24:47 +00:00
Adam Powell
3a153c0de2 Merge "Fix a bug in submenu presenter priority handling" into klp-dev 2014-03-11 01:22:10 +00:00