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

120477 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
1c65e293bd am ec463b96: resolved conflicts for merge of cc9894c8 to klp-modular-dev-plus-aosp 
* commit 'ec463b96e188f2c68cbef2362e570118a3a460ed':
  Retain display when creating specialized contexts. (DO NOT MERGE)
 2014-03-12 04:05:24 +00:00
Jeff Brown
ec463b96e1 resolved conflicts for merge of cc9894c8 to klp-modular-dev-plus-aosp 
Change-Id: I0fa4486ed300a35de3af8748e01300b01f03ec01
 2014-03-11 21:01:49 -07:00
Jeff Brown
e39ef09896 Add a temporary hack to report screen on while dozing. 
The window manager and view hierarchy currently disable all drawing
when PowerManager.isScreenOn() returns false so no drawing occurs
while dozing.  This will be fixed in a future patch to take the
display blanking state into account correctly.

This patch is a workaround to unblock development in the meantime.

Bug: 13133142
Change-Id: I2dc0b422c77285e657d73adca2606aa68264d987
 2014-03-11 20:56:26 -07:00
Jeff Brown
f86c3a44f2 Retain display when creating specialized contexts. (DO NOT MERGE) 
Fixed a bug that cause Context.createPackageContext() to discard
display information.  Likewise also fixes issues where the
activity token, override configuration, user handle, and
restriction state might be discarded.

As part of this change, reworked how Contexts are created to make
initialization easier to understand and less error-prone.
The init() methods have been removed and most of the state is
now stored in final variables.

Bug: 12015587
Change-Id: If795851f1cd078bef889b76a52e00d9b3c06ab11
 2014-03-11 20:43:52 -07:00
Jeff Brown
cc9894c825 Merge "Retain display when creating specialized contexts. (DO NOT MERGE)" into klp-modular-dev 2014-03-12 03:42:20 +00:00
Jeff Brown
089886058a Retain display when creating specialized contexts. (DO NOT MERGE) 
Fixed a bug that cause Context.createPackageContext() to discard
display information.  Likewise also fixes issues where the
activity token, override configuration, user handle, and
restriction state might be discarded.

As part of this change, reworked how Contexts are created to make
initialization easier to understand and less error-prone.
The init() methods have been removed and most of the state is
now stored in final variables.

Bug: 12015587
Change-Id: If795851f1cd078bef889b76a52e00d9b3c06ab11
 2014-03-11 19:30:22 -07:00
Justin Koh
c65caed6da am c48701a1: am 641d8aff: Merge "Fix possible invalid pointer index in swipe dismiss." into klp-modular-dev 
* commit 'c48701a134d3ba05e35d94da921abe1120b67185':
  Fix possible invalid pointer index in swipe dismiss.
 2014-03-12 00:49:44 +00:00
Justin Koh
c48701a134 am 641d8aff: Merge "Fix possible invalid pointer index in swipe dismiss." into klp-modular-dev 
* commit '641d8aff87cbb9ed5e84ce849e0da3d3962b5eb3':
  Fix possible invalid pointer index in swipe dismiss.
 2014-03-12 00:47:20 +00:00
Justin Koh
641d8aff87 Merge "Fix possible invalid pointer index in swipe dismiss." into klp-modular-dev 2014-03-12 00:44:22 +00:00
Deepanshu Gupta
c32a98b8cc am f978f16e: resolved conflicts for merge of c76345a3 to klp-modular-dev-plus-aosp 
* commit 'f978f16e50374681b0ade2d14a5e39cedaea6c2f':
  Fix the delegate method signatures in LayoutLib
 2014-03-11 23:43:26 +00:00
Deepanshu Gupta
f978f16e50 resolved conflicts for merge of c76345a3 to klp-modular-dev-plus-aosp 
Change-Id: Id0aae224e17651bc07aa3f5b1a06923603d025b8
 2014-03-11 16:39:13 -07:00
Justin Koh
df4ee5c8ac Fix possible invalid pointer index in swipe dismiss. 
Fix possible invalid pointer index in swipe dismiss: exit out if the pointer
index is -1. Also allow user to cancel this if in swipe mode.

Change-Id: I0f623ced0287679be8dd5c93ab6c67504b82fe9b
 2014-03-11 16:27:25 -07:00
Michael Wright
81686bd93c am a54f852d: am ed28fc89: Utilize new Android LED constants. DO NOT MERGE 
* commit 'a54f852d3df7ac2e245ccffe8409b217330e5092':
  Utilize new Android LED constants. DO NOT MERGE
 2014-03-11 23:26:39 +00:00
Adam Powell
898d6d964c am 7f2c9e94: Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev 
* commit '7f2c9e9420252a493b7399639f794c8a963444e5':
  Add a config override for ViewConfiguration#hasPermanentMenuKey
 2014-03-11 23:26:38 +00:00
Jose Lima
c770e064ef am dd0db799: am 5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev 
* commit 'dd0db799ee25833a8989a823299f039ac31fef58':
  Added LEANBACK_LAUNCHER Intent category
 2014-03-11 23:20:32 +00:00
Robert Greenwalt
31734c35bf am ee142967: am e5098b50: am e8af5e10: am 6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev 
* commit 'ee142967f60388d73c3bb99f321a781aa07f1eec':
  DO NOT MERGE Debounce wifi country code Info
 2014-03-11 23:20:28 +00:00
Zhihai Xu
42703d1199 am cb714ae6: am 74f36d31: am c48c9626: am 82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev 
* commit 'cb714ae68e3d1c0047fdb6980fabcafcd57b37b6':
  DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
 2014-03-11 23:20:25 +00:00
Vinit Deshapnde
58795020ef am dbba6f07: am 2e76f5d8: am 5f683ca8: am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev 
* commit 'dbba6f076999afaad720c7c5657f7cbf9cdf2d14':
  DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
 2014-03-11 23:20:22 +00:00
John Spurlock
2fcac8ba6f am b41c951f: am cb5f813b: am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs 
* commit 'b41c951fb1b2a27d3278948f809e90a7c203ca4b':
  Fix doc typos in Vibrator.java
 2014-03-11 23:20:19 +00:00
Scott Main
41b600304e am 60d18cea: am 21207588: am 790c5a4c: am 29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs 
* commit '60d18ceaf12ec24cea18d21121845dc4edcd5272':
  fix some typos for GoogleApiClient doc
 2014-03-11 23:20:16 +00:00
Scott Main
6fc25fb727 am a17a7000: am 2ada4e31: am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs 
* commit 'a17a7000f2e1c5d38694c6329a8efdcad48fe1d5':
  fix typos
 2014-03-11 23:20:13 +00:00
Adam Powell
7f2c9e9420 Merge "Add a config override for ViewConfiguration#hasPermanentMenuKey" into klp-dev 2014-03-11 23:19:37 +00:00
Narayan Kamath
9af19bee1c am 52af2ca9: DO NOT MERGE - Remove data dirs if a new install fails dexopt. 
* commit '52af2ca919c068f1c9389fa4c979d2fe3105af40':
  DO NOT MERGE - Remove data dirs if a new install fails dexopt.
 2014-03-11 23:18:18 +00:00
Naofumi Harada
3b18226133 am 68c0346b: DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted 
* commit '68c0346b22d11a0e2c5e89f1a9206bc06ad3d0cf':
  DO NOT MERGE - FLAG_PRIVILEGED disappears if privileged app is updated and rebooted
 2014-03-11 23:18:00 +00:00
Michael Wright
a54f852d3d am ed28fc89: Utilize new Android LED constants. DO NOT MERGE 
* commit 'ed28fc89e3085a88c6bd8b4269988150f3eceb56':
  Utilize new Android LED constants. DO NOT MERGE
 2014-03-11 23:16:25 +00:00
Deepanshu Gupta
c76345a396 am 792f38dd: Merge "Fix the delegate method signatures in LayoutLib" 
* commit '792f38ddd9e8d25b2c8bf0d67363dbfa56550636':
  Fix the delegate method signatures in LayoutLib
 2014-03-11 16:16:18 -07:00
Michael Wright
ed28fc89e3 Utilize new Android LED constants. DO NOT MERGE 
Also, have EventHub manage game controllers' player LEDs

Change-Id: Ic7dba19ad236a3c7d1aff5d3f938bd239b98d51d
 2014-03-11 14:52:18 -07:00
Deepanshu Gupta
792f38ddd9 Merge "Fix the delegate method signatures in LayoutLib" 2014-03-11 21:22:40 +00:00
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
Jose Lima
dd0db799ee am 5f0c0498: Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev 
* commit '5f0c0498a1382ef955cccca95920ec878fe2a64c':
  Added LEANBACK_LAUNCHER Intent category
 2014-03-11 19:19:11 +00:00
Robert Greenwalt
ee142967f6 am e5098b50: am e8af5e10: am 6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev 
* commit 'e5098b502c28d8f40ff3b39070fc5fb7f1a3e445':
  DO NOT MERGE Debounce wifi country code Info
 2014-03-11 19:19:07 +00:00
Zhihai Xu
cb714ae68e am 74f36d31: am c48c9626: am 82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev 
* commit '74f36d31892d8fdfddbecc7bf3018aa3a190e5fb':
  DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
 2014-03-11 19:19:05 +00:00
Vinit Deshapnde
dbba6f0769 am 2e76f5d8: am 5f683ca8: am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev 
* commit '2e76f5d8a282f4f948f88208e77dc4b3d0ec6634':
  DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
 2014-03-11 19:19:02 +00:00
John Spurlock
b41c951fb1 am cb5f813b: am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs 
* commit 'cb5f813bb642e72777643dcd2bcbd92cc2039388':
  Fix doc typos in Vibrator.java
 2014-03-11 19:18:59 +00:00
Scott Main
60d18ceaf1 am 21207588: am 790c5a4c: am 29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs 
* commit '212075889eab9aab2c48881803888a1b827d77ba':
  fix some typos for GoogleApiClient doc
 2014-03-11 19:18:55 +00:00
Scott Main
a17a7000f2 am 2ada4e31: am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs 
* commit '2ada4e310d728756fc9bf69086987bfe215dc487':
  fix typos
 2014-03-11 19:18:48 +00:00
Jose Lima
5f0c0498a1 Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev 2014-03-11 18:08:53 +00: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
Robert Greenwalt
e5098b502c am e8af5e10: am 6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev 
* commit 'e8af5e10e04697acb26b47e5d60b99e5c61a020c':
  DO NOT MERGE Debounce wifi country code Info
 2014-03-11 17:44:20 +00:00
Zhihai Xu
74f36d3189 am c48c9626: am 82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev 
* commit 'c48c9626bd2eb91aab33a034baf139aa2b92671d':
  DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
 2014-03-11 17:43:56 +00:00
Vinit Deshapnde
2e76f5d8a2 am 5f683ca8: am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev 
* commit '5f683ca80611c3e98c91f631ee05dccf3e7e0227':
  DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
 2014-03-11 17:43:50 +00:00
John Spurlock
cb5f813bb6 am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs 
* commit '0a3cb2ce1b2472b7e4ca6739eaeaa50975abf6ab':
  Fix doc typos in Vibrator.java
 2014-03-11 17:43:46 +00:00
Scott Main
212075889e am 790c5a4c: am 29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs 
* commit '790c5a4c06e0ceee8fbdbed575e93ef257124569':
  fix some typos for GoogleApiClient doc
 2014-03-11 17:43:42 +00:00
Scott Main
2ada4e310d am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs 
* commit '7b0c111b5f3595de5cac61b0657a6f2ecb7e77bd':
  fix typos
 2014-03-11 17:43:38 +00:00
Jose Lima
38b75b6126 Added LEANBACK_LAUNCHER Intent category 
Change-Id: I4f5ccfa9725106f558972c73abbe3f9435267c75
 2014-03-11 10:43:31 -07:00