119658 Commits

Author SHA1 Message Date
Justin Koh
641d8aff87 Merge "Fix possible invalid pointer index in swipe dismiss." into klp-modular-dev 2014-03-12 00:44:22 +00: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
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
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
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
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
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
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
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
Jason Sams
780d57b81a am cf8573c1: Fix destruction issues relating to AllocationAdapter.
* commit 'cf8573c15456c4581b691c7380722ea6dccf11c5':
  Fix destruction issues relating to AllocationAdapter.
2014-03-11 01:12:32 +00:00
Jason Sams
e14d5e9011 am 5757bf89: Add hidden minor version ID for support lib workarounds.
* commit '5757bf89c44e7a4805340b5634bec13a1caf39f8':
  Add hidden minor version ID for support lib workarounds.
2014-03-11 01:12:29 +00:00
Jason Sams
0165db3802 am ff7256e7: Fix destruction issues relating to AllocationAdapter.
* commit 'ff7256e757502279b1777127a12eba235be679ae':
  Fix destruction issues relating to AllocationAdapter.
2014-03-11 01:12:23 +00:00
Christopher Tate
4bda43777c DO NOT MERGE - Don't hang installs if the transport disappears
Bug 12991308

Cherry-pick from master.

Change-Id: Id1abedd77be7207e67d7ca11591973d33125459c
2014-03-10 18:07:12 -07:00
Adam Powell
fd6b99750b Prevent overflow from MeasureSpec.adjust; measure cache fix
Extract the size from the MeasureSpec value before adding the
delta. The opposite order could result in a negative delta causing
overflow into size from the EXACTLY mode, creating a very large size
value in the resulting MeasureSpec.

Don't reapply optical bounds insets after pulling a value from the
measurement cache. (The insets will have already been applied before
insertion into the cache.)

Change-Id: Ib0154f4d6c3a7c31e7fee24fd7d5d10cc5dc71a1
2014-03-10 14:09:18 -07:00
Jason Sams
cf8573c154 Fix destruction issues relating to AllocationAdapter.
bug 13170046

Change-Id: I2a2ba3cbd7d08c659ed8958fbcc01919e36e86b0
2014-03-10 13:32:42 -07:00
Jason Sams
5757bf89c4 Add hidden minor version ID for support lib workarounds.
bug 13170046

Change-Id: I0c77901752e9a0b10bd5be62311c79a0ab7128e5
2014-03-10 13:32:21 -07:00
Jason Sams
ff7256e757 Fix destruction issues relating to AllocationAdapter.
bug 13170046

Change-Id: I922b19c086b675949c6fae66c6dcb4c8af3b715f
2014-03-10 13:31:51 -07:00
Robert Greenwalt
e8af5e10e0 am 6d9ed0c3: Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev
* commit '6d9ed0c35327adfba50004fe9270ee6471459fb0':
  DO NOT MERGE Debounce wifi country code Info
2014-03-10 20:06:23 +00:00
Robert Greenwalt
6d9ed0c353 Merge "DO NOT MERGE Debounce wifi country code Info" into klp-dev 2014-03-10 20:04:10 +00:00
Baligh Uddin
fafc1ce9f8 Import translations. DO NOT MERGE
Change-Id: Iee9ef4f534076df84a28d70663293dc42b26cb99
Auto-generated-cl: translation import
2014-03-10 12:36:47 -07:00
Benoit Goby
c6f0b54d69 Merge "Add CAP_BLOCK_SUSPEND to system server" into klp-modular-dev 2014-03-10 18:59:05 +00:00
Zhihai Xu
c48c9626bd am 82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev
* commit '82ec1442487d66935cb0c30f6da3545d8c33af6e':
  DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
2014-03-10 18:49:47 +00:00
Zhihai Xu
82ec144248 Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev 2014-03-10 18:46:56 +00:00
Zhihai Xu
7434fa31d8 DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
This reverts commit 371427b53c70d1a71012de404c29187fe303a22a.

bug:12099469
Change-Id: I497832b54856a9909fc8651ee67555e02e0e763e
2014-03-10 10:58:14 -07:00
Vinit Deshapnde
5f683ca806 am 5243a760: Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev
* commit '5243a760452dc06ec2fd0c50e1c23c0d8c3d16e7':
  DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi
2014-03-10 17:54:01 +00:00