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

119422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Narayan Kamath
3ba975e75d am 7fe5978b: am 2ba70fd4: Merge "Use reinterpret_cast when an integer is cast to a pointer" 
* commit '7fe5978bf7c4b473d8f6db5a12cfdcd110511331':
  Use reinterpret_cast when an integer is cast to a pointer
 2014-03-11 00:53:11 +00:00
Narayan Kamath
5bf28c1ec8 am a88abfb3: am 6ab07fac: Merge "Use long for pointers in opengl/EGL classes" 
* commit 'a88abfb3a5dccdad6210b294843fa2e21a27d378':
  Use long for pointers in opengl/EGL classes
 2014-03-11 00:53:08 +00:00
Jeff Brown
fc7315c6c1 am 6d71e165: Merge "Round off when calculate next step in Seekbar" 
* commit '6d71e165ba961251f0705b75aafed74eba1bc570':
  Round off when calculate next step in Seekbar
 2014-03-10 17:11:57 -07:00
Jeff Brown
33282d6615 am a41ddccd: Merge "Fixed typo errors in documentation" 
* commit 'a41ddccdc67ace7c9363efebbf6e51710928ce12':
  Fixed typo errors in documentation
 2014-03-10 17:08:27 -07:00
Jeff Brown
aaf23a9a65 am c3f5d694: Merge "Hang off call by power button while screen is on" 
* commit 'c3f5d694324fbe2831405ce60bc43bd0d0183d07':
  Hang off call by power button while screen is on
 2014-03-10 17:08:24 -07:00
Jeff Brown
e7f7af964b am 35c8ebab: Merge "take account of RotationVector\'s new extra parameter" 
* commit '35c8ebab0ac66bf2c12b6986f90a07be402e0076':
  take account of RotationVector's new extra parameter
 2014-03-10 17:08:21 -07:00
Jeff Brown
6d71e165ba Merge "Round off when calculate next step in Seekbar" 2014-03-11 00:06:40 +00:00
Jeff Brown
a41ddccdc6 Merge "Fixed typo errors in documentation" 2014-03-11 00:06:25 +00:00
Jeff Brown
c3f5d69432 Merge "Hang off call by power button while screen is on" 2014-03-11 00:06:01 +00:00
Jeff Brown
35c8ebab0a Merge "take account of RotationVector's new extra parameter" 2014-03-11 00:04:49 +00:00
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
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
534054bc1b 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-10 20:09:48 +00: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
Zhihai Xu
dcba24ae7d 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-10 18:52:03 +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
Greg Hackmann
5468a5c117 am 9e413bf4: am bbfc08b3: Merge changes I6d4fdada,Ia34899a4 
* commit '9e413bf4e562d98b6efeb157369f152edd5f0261':
  open("/dev/rtc0") failure in AlarmManagerService.setTime() should be non-fatal
  Move time setting code from SystemClock to AlarmManagerService
 2014-03-10 18:04:47 +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
1a05cb2bcd 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-10 17:57:13 +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
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
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
Brian Carlstrom
98ba7bd5d1 Only pass -Xprofile-* options to ART 
Bug: 13391896
Change-Id: I5d6a3b900c9b20f02e1d4ccb73f712e9260c7dfd
 2014-03-10 10:22:10 -07:00
John Spurlock
5becf411fb am 0a3cb2ce: am b2bd63f0: Merge "Fix doc typos in Vibrator.java" into klp-docs 
* commit '0a3cb2ce1b2472b7e4ca6739eaeaa50975abf6ab':
  Fix doc typos in Vibrator.java
 2014-03-10 16:26:57 +00:00
Scott Main
5a5cb78bf0 am 790c5a4c: am 29de5063: Merge "fix some typos for GoogleApiClient doc" into klp-docs 
* commit '790c5a4c06e0ceee8fbdbed575e93ef257124569':
  fix some typos for GoogleApiClient doc
 2014-03-10 16:26:54 +00:00
Scott Main
c0eb623c10 am 7b0c111b: am 69e49a81: Merge "fix typos" into klp-docs 
* commit '7b0c111b5f3595de5cac61b0657a6f2ecb7e77bd':
  fix typos
 2014-03-10 16:26:50 +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
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