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

120365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Brian Carlstrom
7b7d111ba2 am 9e736723: am ec4c7752: am ab97d617: Merge "Only pass -Xprofile-* options to ART" 
* commit '9e73672362e2ed98ccfcc15695645daa42a61524':
  Only pass -Xprofile-* options to ART
 2014-03-10 17:54:14 +00: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
Brian Carlstrom
9e73672362 am ec4c7752: am ab97d617: Merge "Only pass -Xprofile-* options to ART" 
* commit 'ec4c7752c22ae26924378d953a6f4a0e8e8b036d':
  Only pass -Xprofile-* options to ART
 2014-03-10 17:51:05 +00:00
Brian Carlstrom
ec4c7752c2 am ab97d617: Merge "Only pass -Xprofile-* options to ART" 
* commit 'ab97d617e8043f7396dc6031c4ddeb2ae632230f':
  Only pass -Xprofile-* options to ART
 2014-03-10 10:47:26 -07:00
Brian Carlstrom
ab97d617e8 Merge "Only pass -Xprofile-* options to ART" 2014-03-10 17:44:31 +00:00
Brian Carlstrom
98ba7bd5d1 Only pass -Xprofile-* options to ART 
Bug: 13391896
Change-Id: I5d6a3b900c9b20f02e1d4ccb73f712e9260c7dfd
 2014-03-10 10:22:10 -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
Narayan Kamath
92860a74c6 am 8272c84c: am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic." 
* commit '8272c84cb531a4f148f0b0a31d8359d381137378':
  LP64: Make 9 patches architecture agnostic.
 2014-03-10 10:51:11 +00:00
Narayan Kamath
8272c84cb5 am bbf82665: am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic." 
* commit 'bbf826659e8e5d0be683b2459207c495303d53b6':
  LP64: Make 9 patches architecture agnostic.
 2014-03-10 10:47:45 +00:00
Narayan Kamath
bbf826659e am 6e2fb587: Merge "LP64: Make 9 patches architecture agnostic." 
* commit '6e2fb587d71631bd29fdb844a6451d68e2144337':
  LP64: Make 9 patches architecture agnostic.
 2014-03-10 03:46:07 -07:00
Narayan Kamath
6e2fb587d7 Merge "LP64: Make 9 patches architecture agnostic." 2014-03-10 10:43:58 +00:00
Narayan Kamath
6381dd4ff2 LP64: Make 9 patches architecture agnostic. 
The Res_png_9patch struct had several pointer members
whose size differed between 32 and 64 bit platforms.

These members have been replaced by uint32_t offsets
to serialized data. The serialized form for 9patches
places a Res_png_9patch object at the beginning of
serialized data, followed by int32_t arrays of xDivs,
yDivs and colors.

Note that these offsets are not strictly required,
since they can be computed from the values of numXDivs,
numYDivs & numColors, however they are called in tight
loops so having them computed once is a beneficial.

This change also removed the unused patch_equals function
from aapt's Image.cpp.

Change-Id: I3b9ac8ae5c05510d41377cae4dff1c69b40c2531
 2014-03-10 10:00:02 +00:00
Wei Wang
c9d49ff0f1 am e3318add: am 1062080c: am 0ea81eed: (-s ours) am 1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev 
* commit 'e3318addc9c42a7b6d9d1ba8eaff786236b6dec0':
  DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
 2014-03-08 02:18:50 +00:00
Wei Wang
e3318addc9 am 1062080c: am 0ea81eed: (-s ours) am 1327e59f: Merge "DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API." into klp-dev 
* commit '1062080cd323c14d5bd24fb308da9431a0d250e5':
  DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
 2014-03-08 02:15:08 +00: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
Adam Powell
e61accbeb0 am 62563523: am c4a6df22: am 96192157: am f175b19a: Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev 
* commit '6256352364c53ce841e7635f637713a0b7677be6':
  Fix a bug where OnTouchListeners in action views could be removed
 2014-03-08 02:09:36 +00:00
Marco Nelissen
7c1a11c4be am 1b49f105: am bf0fdac1: am f41efb44: am 57a45f22: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev 
* commit '1b49f10580a33838de54389095dbe5dddd0bc22b':
  Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
 2014-03-08 02:09:33 +00:00
Craig Mautner
889f705df3 am f8c4c3c7: am 508e88e3: am 9bf7f893: (-s ours) am 93df07a1: Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev 
* commit 'f8c4c3c765ca5d4faa4aed6940e5a26c9c7f1d44':
  Show the keyguard if unsecure window on top. DO NOT MERGE.
 2014-03-08 02:09:30 +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
Adam Powell
6256352364 am c4a6df22: am 96192157: am f175b19a: Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev 
* commit 'c4a6df22649378631c4e541ed81c5848735427dd':
  Fix a bug where OnTouchListeners in action views could be removed
 2014-03-08 02:03:06 +00:00
Marco Nelissen
1b49f10580 am bf0fdac1: am f41efb44: am 57a45f22: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev 
* commit 'bf0fdac12d325098b65cde2c76dece85b753d663':
  Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
 2014-03-08 02:03:03 +00:00
Craig Mautner
f8c4c3c765 am 508e88e3: am 9bf7f893: (-s ours) am 93df07a1: Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev 
* commit '508e88e329cd157c3de94ccbac7374038f7e2355':
  Show the keyguard if unsecure window on top. DO NOT MERGE.
 2014-03-08 02:03:00 +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
Dave Allison
199670c46a am 324aa693: am b94904ab: am 3fc3b9fd: Merge "ART profiler usage." 
* commit '324aa693b82656809b97e307676adbbce37c3d95':
  ART profiler usage.
 2014-03-08 02:00:39 +00:00
Tim Kilbourn
a81ee86b58 am 032305fb: am b559b371: Merge "Dump leanback info in aapt dump badging." into klp-modular-dev 
* commit '032305fbcf1f1923030723d60621d8bbfa138511':
  Dump leanback info in aapt dump badging.
 2014-03-08 02:00:36 +00:00
Ying Wang
71364f8c1e am f5f4d930: am 74bebf6f: Exclude the host aapt and aidl from PDK build. 
* commit 'f5f4d9306011ea1b10d25c959334f3e62df4447e':
  Exclude the host aapt and aidl from PDK build.
 2014-03-08 02:00:34 +00:00
Dave Allison
324aa693b8 am b94904ab: am 3fc3b9fd: Merge "ART profiler usage." 
* commit 'b94904ab6dfbb9db7e8042f10886042a295857d4':
  ART profiler usage.
 2014-03-08 01:56:29 +00:00
Jeff Brown
9e3de5f70d am 6f9f8e7a: am 01b5e765: Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev 
* commit '6f9f8e7aad2f74bc2089a081139111012e62f7db':
  Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
 2014-03-08 01:55:44 +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
032305fbcf am b559b371: Merge "Dump leanback info in aapt dump badging." into klp-modular-dev 
* commit 'b559b37150d24411f0b5ef102ced8d5acf858a0e':
  Dump leanback info in aapt dump badging.
 2014-03-08 01:55:00 +00:00
Ying Wang
f5f4d93060 am 74bebf6f: Exclude the host aapt and aidl from PDK build. 
* commit '74bebf6faed2d34814ffc3d46664330ea568f7b2':
  Exclude the host aapt and aidl from PDK build.
 2014-03-08 01:54:52 +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
Marco Nelissen
110af567e6 am 8e701650: am 34425196: am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev 
* commit '8e701650179c8373a4fc5bf306befc3af2560e9d':
  Make MtpDatabase use libexif instead of libjhead
 2014-03-07 23:39:24 +00:00
Vineeta Srivastava
d6a263f46b am 230e20d2: am 5ef72c30: am f066adde: am dbeb0c12: Merge "telephony: Add same named operator configuration for some operators" into klp-dev 
* commit '230e20d26815ecc1aea1a4709cd7e188d049360f':
  telephony: Add same named operator configuration for some operators
 2014-03-07 23:39:20 +00:00
Jeff Brown
6f9f8e7aad am 01b5e765: Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev 
* commit '01b5e765e59c14cdfb62f1a8684e9116a46874d2':
  Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
 2014-03-07 23:39:12 +00: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