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

125100 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
7026d47ac7 Import translations. DO NOT MERGE 
Change-Id: I80c4b6560d759272c7f605df5ff8fbef8b36486d
Auto-generated-cl: translation import
 2014-03-10 13:14:43 -07:00
Adrian Roos
75fc592847 Merge "Fix bug that allowed avoiding lockout if too many wrong patterns are entered." 2014-03-10 20:07:00 +00:00
Benoit Goby
b08216c082 am 7d50596a: am 6835033a: am c6f0b54d: Merge "Add CAP_BLOCK_SUSPEND to system server" into klp-modular-dev 
* commit '7d50596a9c27b6db6468009ad196707e08f88bd6':
  Add CAP_BLOCK_SUSPEND to system server
 2014-03-10 19:08:36 +00: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
Robert Shih
f0768d71bd Merge "MediaMuxer: added WebM filetype; open output file RW." 2014-03-10 19:02:34 +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
02c7f9582b am 7b7d111b: am 9e736723: am ec4c7752: am ab97d617: Merge "Only pass -Xprofile-* options to ART" 
* commit '7b7d111ba21c7c5ad161207a75f72948c427b1b0':
  Only pass -Xprofile-* options to ART
 2014-03-10 17:57:35 +00:00
Jose Lima
b9f62bf2b8 Change comment for platform version in master 
Change-Id: Iebee3f110a6183c43fd338d89ec46f7ae99f7611
 2014-03-10 10:55:22 -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
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 Reck
1748441181 Merge "DisplayList lifecycle changes" 2014-03-10 17:17:29 +00:00
John Reck
be34f2f3b3 DisplayList lifecycle changes 
Bug: 13360343
 Change DisplayList to be more forgiving with weaker lifecycle
 requirements. Is more self-managed with a strong reference
 to the renderer it needs

 Also fix naming mismatch

Change-Id: I5c89453a72a52954f6f959f0846199705dbb6476
 2014-03-10 10:12:32 -07:00
Paul Lawrence
2bc6857532 Merge "Clean up a few minor issues" 2014-03-10 16:41:22 +00:00
Selim Cinek
eb7bd8bbc3 Merge "Fixed a bug where the current wallpaper could be reset on an update" 2014-03-10 16:07:11 +00:00
Adrian Roos
7c11f8b465 Fix bug that allowed avoiding lockout if too many wrong patterns are entered. 
Bug: 13302967
Change-Id: I78404acd700c338e58270471ba307dad9a6884d6
 2014-03-10 17:00:11 +01:00
John Spurlock
fc558d56c2 Fix compiler warning in Activity.java. 
Otherwise appears in frameworks/base build output.

Change-Id: Id4ee4f01ba8026b2629f4c3b30c7152d9bdcfc64
 2014-03-10 09:56:00 -04:00
Jessica Hummel
863d691efa Merge "Fix build" 2014-03-10 11:02:16 +00:00
Narayan Kamath
b5c4e7fd38 resolved conflicts for merge of 92860a74 to master 
Change-Id: I3036ef9f1251c756092dc5ee2c4fed8146855e1e
 2014-03-10 10:57:05 +00:00
Jessica Hummel
409a688fc6 Fix build 
Change-Id: Ie0741d34044f4b1ba92de8d9d91502f37b223507
 2014-03-10 10:57:01 +00: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
Jessica Hummel
df897d08ce Merge "Extend DeviceAdminReceiver to receive provisioning complete broadcast." 2014-03-10 09:29:25 +00:00
Jean Chalard
30c86ad475 Merge "Improve doc for EditorInfo#initialSel{Start,End}" 2014-03-10 04:03:32 +00:00
Wei Wang
6f91cedfeb am c9d49ff0: (-s ours) 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 'c9d49ff0f19e88fb50f048be8f308f63bc2f5d2a':
  DO NOT MERGE BLE peripheral mode (3/4): Add peripheral mode API.
 2014-03-08 11:02:13 +00:00
Adam Powell
4234344af6 am e61accbe: am 62563523: am c4a6df22: am 96192157: am f175b19a: Merge "Fix a bug where OnTouchListeners in action views could be removed" into klp-dev 
* commit 'e61accbeb0147d87deaff4d0c70e3a00cef259f2':
  Fix a bug where OnTouchListeners in action views could be removed
 2014-03-08 11:02:06 +00:00
Marco Nelissen
73149b3b88 am 7c1a11c4: am 1b49f105: am bf0fdac1: am f41efb44: am 57a45f22: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." into klp-dev 
* commit '7c1a11c4bee664b9ca1e6e6e63a39768d1e70d4d':
  Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
 2014-03-08 11:02:03 +00:00
Craig Mautner
2ab1c09ba8 am 889f705d: (-s ours) 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 '889f705df342c3ecd54d5e14f9cd581c625bc438':
  Show the keyguard if unsecure window on top. DO NOT MERGE.
 2014-03-08 11:01:59 +00:00
Dave Allison
2d3ddc2ba9 am 199670c4: am 324aa693: am b94904ab: am 3fc3b9fd: Merge "ART profiler usage." 
* commit '199670c46a9950bd2e06af43ea082427b542060a':
  ART profiler usage.
 2014-03-08 07:26:41 +00:00
Tim Kilbourn
9eaaaf0fe3 resolved conflicts for merge of a81ee86b to master 
Change-Id: I7be3a64261d2405eda55b43c02b47657f393c095
 2014-03-07 23:04:03 -08:00
Ying Wang
0323098269 am 71364f8c: am f5f4d930: am 74bebf6f: Exclude the host aapt and aidl from PDK build. 
* commit '71364f8c1e1bcc84375830dd5904dfe7cdfb5ed6':
  Exclude the host aapt and aidl from PDK build.
 2014-03-08 05:46:48 +00:00
Jeff Brown
2901e0442a am 9e3de5f7: am 6f9f8e7a: am 01b5e765: Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev 
* commit '9e3de5f70d77f7152b25fec6c27b73d037c1376d':
  Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
 2014-03-08 05:43:12 +00:00
Marco Nelissen
edb35cf57c am 110af567: (-s ours) am 8e701650: am 34425196: am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev 
* commit '110af567e6b213c3adb053e71ce21b08d8880e4d':
  Make MtpDatabase use libexif instead of libjhead
 2014-03-08 04:16:03 +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