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

119825 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
fbd5521fb5 UsbDeviceManager: Fix race condition between accessory start and USB configured uevents 
Bug: 13393825
Change-Id: Ice0ce47b4bd65e453771d44b17352982335e9ebd
 2014-03-10 15:58:11 -07:00
Katie McCormick
07c0ad973a Merge "Doc update: new doc studio layout editor" into klp-docs 2014-03-10 21:51:32 +00:00
John Spurlock
f6228d95ea Merge "Fix doc typos in AppOpsManager.java" into klp-docs 2014-03-10 21:42:37 +00: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
John Spurlock
925b85eae8 Fix doc typos in AppOpsManager.java 
Change-Id: I3c930a2afce48c57570681a95595149df5158053
 2014-03-10 16:52:11 -04: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
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
Adam Powell
190909f2c1 Fix a bug in submenu presenter priority handling 
Now that overflow menus and the PhoneWindow-level ListMenuPresenter
can coexist, make sure that ListMenuPresenter handles submenus spawned
by itself. Introduce an internal API for menus to prefer a specific
presenter when performing item actions.

Bug 11979407

Change-Id: Id0b8fcbb8b310cbb3a63a1e5ea7a89de5d53f86f
 2014-03-10 10:30:59 -07: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
Alan Viverette
bca20aaf0e DO NOT MERGE Quick fix for updating the FastScroller long list property 
BUG: 12553181
Change-Id: I5305b0ec4ae8e069fc98d45dc3d5daaa0628ca79
 2014-03-07 16:50:24 -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
Alan Viverette
df262cd922 DO NOT MERGE Check item type before re-binding transient state views 
BUG: 12701797
Change-Id: I180613cc342d24b63f80fd699937c7543c38fc20
 2014-03-07 15:20:13 -08: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
Alan Viverette
e8d2846fb9 DO NOT MERGE Ensure transient state views are temporarily detached 
BUG: 12024471
Change-Id: I02659d65d664b3fd8991a0527bd23801db6f1a9d
 2014-03-07 14:08:02 -08:00
Jeff Brown
6212a49a94 Declare KEYCODE_SLEEP and KEYCODE_WAKEUP. 
These new keys behave in similarly to KEYCODE_POWER but do not
simply toggle between awake and asleep states.

Sleep puts the device to sleep if it is awake.
Wakeup wakes up the device if it is asleep.

Bug: 12938999
Change-Id: I260fb918cc858882fe06fa880910df5763a76c5d
 2014-03-07 14:02:55 -08:00
Marco Nelissen
3442519699 am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev 
* commit 'ac87587875f1dfade5e06a82ccc009d0f0170569':
  Make MtpDatabase use libexif instead of libjhead
 2014-03-07 21:18:52 +00:00
Vineeta Srivastava
5ef72c3084 am f066adde: am dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev 
* commit 'f066adde7a3722deba0226715af695537511271e':
  telephony: Add same named operator configuration for some operators
 2014-03-07 21:18:47 +00:00