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

174606 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
428472a1e4 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:20:51 +00:00
Geoff Mendal
f456898cb9 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:20:27 +00:00
Geoff Mendal
db14d28944 Import translations. DO NOT MERGE 
Change-Id: I12dd7931cbe95c7dfb4c9c468e19a25bcd780324
Auto-generated-cl: translation import
 2015-02-26 16:18:09 -08:00
Geoff Mendal
c4f503fd77 Import translations. DO NOT MERGE 
Change-Id: I69d645539c36b3915e43eaa0d7b190bc6d559840
Auto-generated-cl: translation import
 2015-02-26 16:16:10 -08:00
Geoff Mendal
ee13d90c18 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:15:46 +00:00
Geoff Mendal
61379caf15 Import translations. DO NOT MERGE 
Change-Id: Idb623a7515bd47274efcd49cc7f9182296213202
Auto-generated-cl: translation import
 2015-02-26 16:14:09 -08:00
Geoff Mendal
791dcb9597 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:13:08 +00:00
Geoff Mendal
5277e14417 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:12:54 +00:00
Geoff Mendal
d0625cedca Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:12:32 +00:00
Geoff Mendal
46c5d0b157 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:11:53 +00:00
Geoff Mendal
f24cf43727 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:11:01 +00:00
Geoff Mendal
d307a122ae Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:10:11 +00:00
Geoff Mendal
40f6a22b6e Import translations. DO NOT MERGE 
Change-Id: I1a8de3ff34e0661702038b8f006f920c5ca3ba27
Auto-generated-cl: translation import
 2015-02-26 16:08:40 -08:00
Geoff Mendal
57d73dbd34 Import translations. DO NOT MERGE 
Change-Id: I333284d756efb9b6f22577b047e95fde5a27ff71
Auto-generated-cl: translation import
 2015-02-26 16:04:59 -08:00
Geoff Mendal
f74ee77486 Import translations. DO NOT MERGE 
Change-Id: I59953f8c826f975cd602346307300d124b884a1c
Auto-generated-cl: translation import
 2015-02-26 16:02:59 -08:00
Geoff Mendal
5e8e930aec Import translations. DO NOT MERGE 
Change-Id: I893f1ac696506a8a96a1e447b3851ed3bf51c31c
Auto-generated-cl: translation import
 2015-02-26 15:59:12 -08:00
Geoff Mendal
413c7a9cca Import translations. DO NOT MERGE 
Change-Id: I5fb0da094aa109b970f333aea78b0366f2f5eb2c
Auto-generated-cl: translation import
 2015-02-26 15:57:08 -08:00
Geoff Mendal
1a61491215 Import translations. DO NOT MERGE 
Change-Id: I654168fbbcd5fe9371390f2d673561ce1e5c9c89
Auto-generated-cl: translation import
 2015-02-26 15:54:57 -08:00
Mark Salyzyn
ca50cd2114 jni: Add paranoia regarding android_logger_list_read 
Change-Id: Ic52be201ec7efaef6a385aaf8ea523554aa06f22
 2015-02-26 14:49:17 -08:00
Geoff Mendal
70eb8077a2 Import translations. DO NOT MERGE 
Change-Id: Ic79aace8bc91318a1d637c834ae3176ee221bead
Auto-generated-cl: translation import
 2015-02-26 12:53:29 -08:00
Narayan Kamath
4d8caa5576 am 8cba382f: Merge "Bad month value in DatePicker in Calendar Mode" 
* commit '8cba382f04e4ead4a6b8c4a74216ddb383e8db91':
  Bad month value in DatePicker in Calendar Mode
 2015-02-26 17:49:19 +00:00
Narayan Kamath
8cba382f04 Merge "Bad month value in DatePicker in Calendar Mode" 2015-02-26 17:42:24 +00:00
You Kim
49e6c4adbf Bad month value in DatePicker in Calendar Mode 
Calendar MONTH field is zero based. Use predefined month.

Change-Id: I957bf385dc8e877e8698dacad68808f4d9d8a6d0
 2015-02-26 19:06:16 +09:00
Jason Sams
add04be7c8 Fix crash when updating adapter offsets. 
Change-Id: I0a6923e387f9743a06cc2c4c67995a79789d4cdd
 2015-02-25 16:42:00 -08:00
Miao Wang
c8e237e271 [Renderscript] JAVA API update for Allocation.CopyTo 
add the following functions to make it more symmetric to copyFrom().

  - copy1DRangeToUnchecked, copy1DRangeTo
  - copy2DRangeToUnchecked, copy2DRangeTo
  - copy3DRangeToUnchecked, copy3DRangeTo
  - setFromFieldPacker, 2D and 3D variants
  - copyElementTo, (1D, 2D & 3D)

Change-Id: I6b896123e1c00cead552aa5b31a701b15dd70f85
 2015-02-25 16:41:09 -08:00
Dan Albert
b7121d7030 am b78cce6f: Merge "Update autogenerated gl functions." 
* commit 'b78cce6f92e38b57a6a56183cdbafc054c5758fe':
  Update autogenerated gl functions.
 2015-02-25 23:00:52 +00:00
Dan Albert
b78cce6f92 Merge "Update autogenerated gl functions." 2015-02-25 22:50:25 +00:00
Mark Salyzyn
533758c1fb am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags" 
* commit '0d8b97a44e4cb5c5cfffd6421eb2cec1ebc00d2f':
  jni: switch to ANDROID_LOG_* mode flags
 2015-02-25 19:13:12 +00:00
Mark Salyzyn
0d8b97a44e Merge "jni: switch to ANDROID_LOG_* mode flags" 2015-02-25 19:04:24 +00:00
Mark Salyzyn
18998c9852 jni: switch to ANDROID_LOG_* mode flags 
Change-Id: I8aea5bf4faf79a96fa8485f7707e7484cd11d7a3
 2015-02-25 18:07:21 +00:00
Narayan Kamath
76507a64b5 am 72dc62ea: Merge "Track removal of refcounts from FileMap." 
* commit '72dc62ead214bdec5c46d42f4e859b139dba0a00':
  Track removal of refcounts from FileMap.
 2015-02-24 12:56:52 +00:00
Narayan Kamath
72dc62ead2 Merge "Track removal of refcounts from FileMap." 2015-02-24 12:50:57 +00:00
Narayan Kamath
948682d15f am 6e208cdd: Merge "Remove wrong javadoc comment" 
* commit '6e208cddad3315c4e38accdb801908b2b9b5cbbd':
  Remove wrong javadoc comment
 2015-02-24 10:11:52 +00:00
Narayan Kamath
6e208cddad Merge "Remove wrong javadoc comment" 2015-02-24 10:04:33 +00:00
Chad Brubaker
cdc70256f4 am f3c117ca: Merge "Add new IKeystoreService methods to KeyStore" 
* commit 'f3c117ca0d116b01174732790be1939282d0a5a0':
  Add new IKeystoreService methods to KeyStore
 2015-02-23 22:45:11 +00:00
Chad Brubaker
1629f9543a am 598f9b2a: Merge "Add Keymaster 0.4 binder API" 
* commit '598f9b2a19bf5adf834f9a0edd12d4b4bc7ea27d':
  Add Keymaster 0.4 binder API
 2015-02-23 22:45:01 +00:00
Chad Brubaker
f3c117ca0d Merge "Add new IKeystoreService methods to KeyStore" 2015-02-23 22:20:59 +00:00
Chad Brubaker
598f9b2a19 Merge "Add Keymaster 0.4 binder API" 2015-02-23 22:20:39 +00:00
Chad Brubaker
e6a461341c Add new IKeystoreService methods to KeyStore 
Add wrappers for all the new IKeystoreService keymaster 0.4 methods to
android.security.KeyStore.

Change-Id: Icb5500cfffb62d1af326edf326e1b9b67e5cece9
 2015-02-23 14:12:44 -08:00
Chad Brubaker
45ff13ea28 Add Keymaster 0.4 binder API 
This adds the classes for creating and serializing arguments and results
from keymaster as well as the enum values from
hardware/libhardware/include/hardware/keymaster_defs.h which will be
needed for argument creation as well as converting keymaster error
codes into Java exceptions.

Change-Id: I61046756361d43d9f02eea370c2cbd07c3638ea3
 2015-02-23 14:12:37 -08:00
Dan Albert
10caf0390d Update autogenerated gl functions. 
Corresponding frameworks/native change:
https://android-review.googlesource.com/#/c/134491/

Since this fixes the int-to-pointer cast issues, stop ignoring that
warning.

Change-Id: I85134dc151ba368e4619e36125264b2b3f104202
 2015-02-23 10:47:19 -08:00
Narayan Kamath
688ff4cf0f Track removal of refcounts from FileMap. 
Use delete instead of release.

Change-Id: I25c841b368aa9d51e9259399b94cafa2bbb7a076
 2015-02-23 15:47:54 +00:00
Narayan Kamath
c90df0768a am 6b492e78: Merge "Clean up Javadocs for UEventObserver" 
* commit '6b492e78115833f0093d1517483728b574121c07':
  Clean up Javadocs for UEventObserver
 2015-02-23 10:54:40 +00:00
Narayan Kamath
6b492e7811 Merge "Clean up Javadocs for UEventObserver" 2015-02-23 10:50:19 +00:00
Valter Strods
7014b26c3e Clean up Javadocs for UEventObserver 
This commit removes a couple of apostrophes from the word "UEvents" as
the apostrophes would only be needed if something that belongs to the
UEvent was being talked about. Instead, the UEvents are being talked
about themselves - as a bunch.

Change-Id: I6a7908c6b73c0739102b632d2499e0f1e3c2d47f
 2015-02-23 10:48:32 +00:00
Elliott Hughes
92c4f1756d am d002e027: Merge "Fix \'fuchsia\' typo." 
* commit 'd002e02750b51fed3da41a2b4b222824df8d1a10':
  Fix 'fuchsia' typo.
 2015-02-21 17:09:46 +00:00
Elliott Hughes
d002e02750 Merge "Fix 'fuchsia' typo." 2015-02-21 17:04:21 +00:00
Elliott Hughes
fd9bc7bb36 Fix 'fuchsia' typo. 
Bug: https://code.google.com/p/android/issues/detail?id=152142
Change-Id: Ib45f2d19d52fe9d95d560d37296d50cba190cb83
 2015-02-21 09:03:13 -08:00
Jason Sams
a15ac5fea3 am adb52ef7: Merge "Implement finalizer for RS contexts." 
* commit 'adb52ef7034d4d3e0eee58cedae2a343d29771b9':
  Implement finalizer for RS contexts.
 2015-02-20 20:00:40 +00:00
Jason Sams
adb52ef703 Merge "Implement finalizer for RS contexts." 2015-02-20 19:51:54 +00:00