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

119575 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Wright
b0aa4822f5 Controllers must have buttons and a movement mechanism. 
Some devices have joystick axes or DPad keys, but no gamepad buttons
(or vice versa). We shouldn't count these as gamepads since games
can't really be expected to work with this setup in the general case.
Instead, require that a device has a movement mechanism (joystick
axes or DPad buttons), as well as at least one gamepad button before
considering it a controller.

Bug: 13432364
Change-Id: Ia113c8441557d4c858c1e5740a3e1c7e0e9fdcdd
 2014-03-12 12:58:53 -07:00
Jeff Brown
2d8a3908d2 Fix power manager display wake lock bugs. 
Under certain circumstances, the power manager might continue to
hold the display wakelock long after the display had been turned
off due to the mDisplayReady flag having an incorrect value.

1. An inverted conditional caused DisplayPowerState to incorrectly
signal the screen on ready state.

2. The DisplayPowerController failed to clear the block screen on
flag in the case where the screen was turned off before it became
unblocked from turning on.  This could happen when the display was
rapidly turned on-off-on-off.

Bug: 13248135
Change-Id: I8faa3034695c83c8cd35613d81acccf40d22128d
 2014-03-11 23:23:58 -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
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
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
Jose Lima
5f0c0498a1 Merge "Added LEANBACK_LAUNCHER Intent category" into klp-modular-dev 2014-03-11 18:08:53 +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
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
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
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
Vinit Deshapnde
5243a76045 Merge "DO NOT MERGE - Fix Airplane Mode + reboot interaction for Wifi" into klp-dev 2014-03-10 17:51:19 +00:00
John Spurlock
0a3cb2ce1b am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs 
* commit 'b2bd63f00631b68df3595a4369ec4802e6443bc7':
  Fix doc typos in Vibrator.java
 2014-03-10 16:24:31 +00:00
Scott Main
790c5a4c06 am 29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs 
* commit '29de50633348fb6329ed38980abce0010253a941':
  fix some typos for GoogleApiClient doc
 2014-03-10 16:24:29 +00:00
Scott Main
7b0c111b5f am 69e49a81: Merge "fix typos" into klp-docs 
* commit '69e49a819a5fd3a9d0ede1ba18f204e5e2050da6':
  fix typos
 2014-03-10 16:24:26 +00:00
John Spurlock
b2bd63f006 Merge "Fix doc typos in Vibrator.java" into klp-docs 2014-03-10 16:22:22 +00:00
Scott Main
29de506333 Merge "fix some typos for GoogleApiClient doc" into klp-docs 2014-03-10 16:21:10 +00:00
Scott Main
69e49a819a Merge "fix typos" into klp-docs 2014-03-10 16:20:45 +00:00
John Spurlock
0f49c28e7a Fix doc typos in Vibrator.java 
Change-Id: Ie95cd7fa16042897e6acf94badec98bc19bde57a
 2014-03-10 11:29:35 -04:00
Wei Wang
1062080cd3 am 0ea81eed: (-s ours) am 1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev 
* commit '0ea81eed882d288c9473e377639b0b88280fd044':
  DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
 2014-03-08 02:11:17 +00:00
Wei Wang
0ea81eed88 am 1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev 
* commit '1327e59f36ceea5a1ee7dc66b311206345353de5':
  DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
 2014-03-08 02:05:57 +00:00
Wei Wang
1327e59f36 Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev 2014-03-08 02:01:02 +00:00
Adam Powell
c4a6df2264 am 96192157: am f175b19a: Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev 
* commit '96192157b88d3630827a9ffd55693866734b4da3':
  Fix a bug where OnTouchListeners in action views could be removed
 2014-03-08 01:55:41 +00:00
Marco Nelissen
bf0fdac12d am f41efb44: am 57a45f22: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev 
* commit 'f41efb446a40f0904f3788c2a773f2a700b1342a':
  Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
 2014-03-08 01:55:36 +00:00
Craig Mautner
508e88e329 am 9bf7f893: (-s ours) am 93df07a1: Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev 
* commit '9bf7f893e0833fca9b240c11b98d6d7dc1892081':
  Show the keyguard if unsecure window on top. DO NOT MERGE.
 2014-03-08 01:55:33 +00:00
Tim Kilbourn
b559b37150 Merge "Dump leanback info in aapt dump badging." into klp-modular-dev 2014-03-08 00:55:48 +00:00
Robert Greenwalt
fcbced38a6 DO NOT MERGE Debounce wifi country code Info 
We're getting signals from the radio and it sometimes drops out for
a while.  This change will delay applying an empty country code
for 15sec but apply non-empty country codes immediately.  It uses a
sequence number so we only apply the most recent change, even if
it's delayed.

Also secures the wifi call to set the country code as we can't
allow apps to set it willy-nilly.

bug:11062898
Change-Id: I610039a833e26d4c5c8b7b9ac1b7546f3c83446a
 2014-03-07 16:54:58 -08:00
Tim Kilbourn
0a5a5d6996 Dump leanback info in aapt dump badging. 
Leanback launcher activities are reported, including the banner.

Change-Id: Ifa496736ad3ba4239ec95e166768af895ff4dc53
 2014-03-07 16:47:42 -08:00
Benoit Goby
a26d08e612 Add CAP_BLOCK_SUSPEND to system server 
With linux 3.5 and above, CAP_BLOCK_SUSPEND is needed to take a
suspend blocker.

CAP_BLOCK_SUSPEND has aleady been added in master.

Change-Id: Ibd4b1f8498c3c4a7b69ea9fc68311546a8f0ecda
 2014-03-08 00:17:43 +00:00
Ying Wang
74bebf6fae Exclude the host aapt and aidl from PDK build. 
Bug: 13028632
Change-Id: I0f774b19be77462d0fa271088a4a5a152729d13c
 2014-03-07 15:56:14 -08:00
Adam Powell
96192157b8 am f175b19a: Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev 
* commit 'f175b19aaac7ffe5553013d996a073693cac929d':
  Fix a bug where OnTouchListeners in action views could be removed
 2014-03-07 23:38:30 +00:00
Marco Nelissen
f41efb446a am 57a45f22: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev 
* commit '57a45f22ea7b0509fb918fa39e797a6061f75438':
  Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
 2014-03-07 23:38:27 +00:00
Craig Mautner
9bf7f893e0 am 93df07a1: Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev 
* commit '93df07a1b72488b64354098cd00dff1d36b76b12':
  Show the keyguard if unsecure window on top. DO NOT MERGE.
 2014-03-07 23:38:20 +00:00
Adam Powell
f175b19aaa Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev 2014-03-07 23:28:19 +00:00
Marco Nelissen
57a45f22ea Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev 2014-03-07 22:49:33 +00:00
Craig Mautner
93df07a1b7 Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev 2014-03-07 22:30:26 +00:00
Jeff Brown
01b5e765e5 Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev 2014-03-07 22:15:08 +00:00
Elliott Hughes
0bb17193cc Fix a JNI local reference leak in JNIMediaPlayerListener::notify. 
Bug: https://code.google.com/p/android/issues/detail?id=62137
b/12603577
Change-Id: I776cd83a66de37fdbbe8af367bf1b26e5e0c7247
 2014-03-07 14:10:52 -08:00