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

120277 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
ad35099a87 am b485d8e1: am 194e77aa: am 0f3fd6c6: Merge "Remove stray logging statement." 
* commit 'b485d8e1e405296307197ae07c6ed214be3b4f58':
  Remove stray logging statement.
 2014-03-11 12:08:58 +00:00
Narayan Kamath
b485d8e1e4 am 194e77aa: am 0f3fd6c6: Merge "Remove stray logging statement." 
* commit '194e77aafe32cacc00f69b25bec6eeea67eb0205':
  Remove stray logging statement.
 2014-03-11 12:06:00 +00:00
Narayan Kamath
194e77aafe am 0f3fd6c6: Merge "Remove stray logging statement." 
* commit '0f3fd6c66e8376e62ed61dd2b92ea4807571b3de':
  Remove stray logging statement.
 2014-03-11 05:03:36 -07:00
Narayan Kamath
0f3fd6c66e Merge "Remove stray logging statement." 2014-03-11 12:00:55 +00:00
Narayan Kamath
c3955e7e5a Remove stray logging statement. 
bug: https://code.google.com/p/android/issues/detail?id=66974
Change-Id: Ie34c102de143cf6aeb16c78778dda3ef5e928380
 2014-03-11 11:08:41 +00:00
Jeff Brown
1c4d86c7b4 am f54d62dc: am fc7315c6: am 6d71e165: Merge "Round off when calculate next step in Seekbar" 
* commit 'f54d62dc80b43a72adaa273836f00153ce7edc72':
  Round off when calculate next step in Seekbar
 2014-03-11 00:19:07 +00:00
Jeff Brown
f54d62dc80 am fc7315c6: am 6d71e165: Merge "Round off when calculate next step in Seekbar" 
* commit 'fc7315c6c17e6ebc559d2ea0afb8be64c5d7b86c':
  Round off when calculate next step in Seekbar
 2014-03-11 00:15:38 +00:00
Jeff Brown
1491aaf503 am 14006523: am 33282d66: am a41ddccd: Merge "Fixed typo errors in documentation" 
* commit '140065230900b465f85f64c5da5181d124076e1d':
  Fixed typo errors in documentation
 2014-03-11 00:15:14 +00:00
Jeff Brown
70c274361e am daa1c969: am aaf23a9a: am c3f5d694: Merge "Hang off call by power button while screen is on" 
* commit 'daa1c96954f666b9f661501e11014a57533eefad':
  Hang off call by power button while screen is on
 2014-03-11 00:15:11 +00:00
Jeff Brown
3c6bb4d4ec am f2e837e5: am e7f7af96: am 35c8ebab: Merge "take account of RotationVector\'s new extra parameter" 
* commit 'f2e837e57900514a554f174a29730157160c1fa1':
  take account of RotationVector's new extra parameter
 2014-03-11 00:15:03 +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
1400652309 am 33282d66: am a41ddccd: Merge "Fixed typo errors in documentation" 
* commit '33282d66155e8d68acea512989ec61cb15fae1ce':
  Fixed typo errors in documentation
 2014-03-11 00:11:14 +00:00
Jeff Brown
daa1c96954 am aaf23a9a: am c3f5d694: Merge "Hang off call by power button while screen is on" 
* commit 'aaf23a9a653457cccf54293b2ff76196718c7a1a':
  Hang off call by power button while screen is on
 2014-03-11 00:11:10 +00:00
Jeff Brown
f2e837e579 am e7f7af96: am 35c8ebab: Merge "take account of RotationVector\'s new extra parameter" 
* commit 'e7f7af964baa3c5d36abd163e33ad139310049d2':
  take account of RotationVector's new extra parameter
 2014-03-11 00:11:05 +00: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
Adam Powell
8566f1561b am c8b43bc0: am fd6b9975: Prevent overflow from MeasureSpec.adjust; measure cache fix 
* commit 'c8b43bc0021aea63858044551f13cae86f4e5699':
  Prevent overflow from MeasureSpec.adjust; measure cache fix
 2014-03-10 23:35:16 +00:00
Adam Powell
c8b43bc002 am fd6b9975: Prevent overflow from MeasureSpec.adjust; measure cache fix 
* commit 'fd6b99750bfab7f930ee375a79009874a3196165':
  Prevent overflow from MeasureSpec.adjust; measure cache fix
 2014-03-10 23:31:04 +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
Benoit Goby
7d50596a9c am 6835033a: am c6f0b54d: Merge "Add CAP_BLOCK_SUSPEND to system server" into klp-modular-dev 
* commit '6835033af4f42132337a65eeeb1e4362a36b0465':
  Add CAP_BLOCK_SUSPEND to system server
 2014-03-10 19:05:13 +00:00
Benoit Goby
6835033af4 am c6f0b54d: Merge "Add CAP_BLOCK_SUSPEND to system server" into klp-modular-dev 
* commit 'c6f0b54d695b49966a13bb196800a985ac6ce212':
  Add CAP_BLOCK_SUSPEND to system server
 2014-03-10 19:02:54 +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
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
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
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