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

141629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Kralevich
3d24150dbb am 23219098: am b70888d4: Merge "Fix a typo in a javadoc comment" 
* commit '23219098a6d623cf1825d8fd9a8d200cdc06aab9':
  Fix a typo in a javadoc comment
 2014-07-05 16:51:38 +00:00
Nick Kralevich
3cdc06bb37 am dbb32da8: am c9eff23b: Merge "Fix typo in DevicePolicyManager documentation" 
* commit 'dbb32da844cf8ed65d0b5005276a86aad7c81853':
  Fix typo in DevicePolicyManager documentation
 2014-07-05 16:51:32 +00:00
Nick Kralevich
3b4c2c982e am 63af727b: Merge "Fix Issue 59989" 
* commit '63af727b4b2e05ca18f1d9f5c8b4e87a6bfd5601':
  Fix Issue 59989
 2014-07-05 16:45:36 +00:00
Nick Kralevich
23219098a6 am b70888d4: Merge "Fix a typo in a javadoc comment" 
* commit 'b70888d45573c015fbb9d584df575bf78f5e9684':
  Fix a typo in a javadoc comment
 2014-07-05 16:45:31 +00:00
Nick Kralevich
dbb32da844 am c9eff23b: Merge "Fix typo in DevicePolicyManager documentation" 
* commit 'c9eff23b443f26fb8c4873a6ecb61eded0564163':
  Fix typo in DevicePolicyManager documentation
 2014-07-05 16:45:26 +00:00
Nick Kralevich
3e5f0229e1 am 58005ec5: am 3b345a6f: Merge "Fix javadoc typo in Message.java: "arg1" -> "arg2"" 
* commit '58005ec545fd011418b6400a3b377fea6928c933':
  Fix javadoc typo in Message.java: "arg1" -> "arg2"
 2014-07-05 16:40:59 +00:00
Nick Kralevich
58005ec545 am 3b345a6f: Merge "Fix javadoc typo in Message.java: "arg1" -> "arg2"" 
* commit '3b345a6f9103c1677a696b4770cc318df45cdcaa':
  Fix javadoc typo in Message.java: "arg1" -> "arg2"
 2014-07-05 16:35:13 +00:00
Nick Kralevich
569172e2da am aa4ff2ef: am eb822cec: Merge "Typo fix in permission string" 
* commit 'aa4ff2efecb1aa03b6a6843bf8a4c19b885db4fc':
  Typo fix in permission string
 2014-07-05 16:27:14 +00:00
Nick Kralevich
aa4ff2efec am eb822cec: Merge "Typo fix in permission string" 
* commit 'eb822cecdb128cb0a00f361b87b8378d5664a458':
  Typo fix in permission string
 2014-07-05 16:22:17 +00:00
Baligh Uddin
314bfe0710 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-07-05 02:59:43 +00:00
Baligh Uddin
6024630882 Import translations. DO NOT MERGE 
Change-Id: I4a6f893b2d7157b8d7d70cb41a5b9c75043342dc
Auto-generated-cl: translation import
 2014-07-05 09:20:43 -07:00
Baligh Uddin
ab157d740e Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2014-07-05 02:59:43 +00:00
Baligh Uddin
54cf94137e Import translations. DO NOT MERGE 
Change-Id: I99893089a51a6984d44db22628dccc90b0867faf
Auto-generated-cl: translation import
 2014-07-05 09:30:04 -07:00
Baligh Uddin
43ba3ba479 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-07-05 02:59:43 +00:00
Baligh Uddin
01cad39548 Import translations. DO NOT MERGE 
Change-Id: I870d8d23d6d1923dcfa118d151e26bf9b7a8f86e
Auto-generated-cl: translation import
 2014-07-05 09:27:47 -07:00
Baligh Uddin
b4600e793b Merge "Import translations. DO NOT MERGE" into klp-dev 2014-07-05 02:59:43 +00:00
Baligh Uddin
4927253e02 Import translations. DO NOT MERGE 
Change-Id: I99d859070b0a2d65c9e57556f7ccc0b4dfb3a995
Auto-generated-cl: translation import
 2014-07-05 09:44:21 -07:00
Baligh Uddin
f1c1e725ec Merge "Import translations. DO NOT MERGE" into klp-dev 2014-07-05 02:59:43 +00:00
Baligh Uddin
4430714771 Import translations. DO NOT MERGE 
Change-Id: I2898d53a3f6bf4fc920fa8c3bc122d00aa879d18
Auto-generated-cl: translation import
 2014-07-05 14:00:41 -07:00
Baligh Uddin
add3fb664a Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2014-07-05 02:59:43 +00:00
Baligh Uddin
bc3bd6c3e4 Import translations. DO NOT MERGE 
Change-Id: Ie1868681bbc06d89a0695863e9146cd2ee85a5de
Auto-generated-cl: translation import
 2014-07-05 14:10:06 -07:00
Narayan Kamath
2d067babdb am 29a9d27d: am 358a3f71: Merge "fix AudioTrack and AudioRecord JNI" 
* commit '29a9d27d3c9224a7709a41096d7a958c8177ac19':
  fix AudioTrack and AudioRecord JNI
 2014-07-04 09:23:55 +00:00
Narayan Kamath
0cf2e65dc0 am 5ae312fb: am 759e0d6a: Merge "Fix LocalePicker locale filtering." 
* commit '5ae312fb5b601d2c60e197f94c6a292700776140':
  Fix LocalePicker locale filtering.
 2014-07-04 09:22:57 +00:00
Narayan Kamath
29a9d27d3c am 358a3f71: Merge "fix AudioTrack and AudioRecord JNI" 
* commit '358a3f716850e96716b766c63d50d3425a4c9ed7':
  fix AudioTrack and AudioRecord JNI
 2014-07-04 08:49:02 +00:00
Narayan Kamath
5ae312fb5b am 759e0d6a: Merge "Fix LocalePicker locale filtering." 
* commit '759e0d6a7a258dbc34a38a7db320827eb9144487':
  Fix LocalePicker locale filtering.
 2014-07-04 08:48:58 +00:00
Narayan Kamath
759e0d6a7a Merge "Fix LocalePicker locale filtering." 2014-07-04 08:02:36 +00:00
Narayan Kamath
80b574199c Fix LocalePicker locale filtering. 
This was broken by commit b27c137087ee92674 which
removed a badly phrased check. Prior to that commit,
there was a check that excluded locales whose toString()
length was not 5.

This change reinstates that check in a less roundabout
way, by excluding BCP-47 tags that don't have a country
subtag.

bug: 16038949

Change-Id: Ic24b1df87b2e2ce47d9ae04c7759088721f27b4f
 2014-07-03 13:31:42 +01:00
Brian Duff
51d70ce9b8 am c542745e: am a6e9dd3f: Merge "Fix a typo in NumberPicker javadoc." 
* commit 'c542745e23fe9d2e71c1f607d66f5570f585133d':
  Fix a typo in NumberPicker javadoc.
 2014-07-03 09:43:56 +00:00
Brian Duff
c542745e23 am a6e9dd3f: Merge "Fix a typo in NumberPicker javadoc." 
* commit 'a6e9dd3f9a2d966faf2d1710d2189127b968dc52':
  Fix a typo in NumberPicker javadoc.
 2014-07-03 06:45:04 +00:00
Nick Kralevich
a347ece5a7 Merge "Fix typo in comment of FragmentTransaction" 2014-07-03 01:32:01 +00:00
Nick Kralevich
ce25948325 Merge "Added missing brace." 2014-07-03 01:32:01 +00:00
Nick Kralevich
a2e4ce2b7c Merge "Fix typo - issue 56671" 2014-07-03 01:32:01 +00:00
Nick Kralevich
8b333467fe Merge "fix trivial typo: s/meansure/measure" 2014-07-03 01:32:01 +00:00
Nick Kralevich
c9eff23b44 Merge "Fix typo in DevicePolicyManager documentation" 2014-07-03 01:32:01 +00:00
Nick Kralevich
eb822cecdb Merge "Typo fix in permission string" 2014-07-03 01:32:01 +00:00
Jason Sams
24bea6a3ef Resolve conflicts with AOSP. 
Change-Id: I2f1afdb83dcfc9078df5d3c2f13abacb6504d73d
 2014-07-02 14:32:24 -07:00
Narayan Kamath
358a3f7168 Merge "fix AudioTrack and AudioRecord JNI" 2014-07-02 20:52:49 +00:00
Eric Laurent
90d0b9e1bb fix AudioTrack and AudioRecord JNI 
AudioTrack and AudioRecord JNI should not cast
jshortArray to jbyteArray. This appeared to work with Dalvik
but causes data corruption with ART.

(cherry picked from commit 9d02848e902d04417df616354db3a18c03e639b7)

Change-Id: Ie36624d3ea06042373c64edced4b5e30b7b1ee86
 2014-07-04 09:37:28 +01:00
Nick Kralevich
ca2df28678 Merge "Fix typo in the exception message." 2014-07-02 20:52:43 +00:00
Nick Kralevich
77491ac00c Merge "Correct typo in doc comment" 2014-07-02 20:52:43 +00:00
Nick Kralevich
a6336747a4 Merge "Fix a copy/paste typo in ViewPropertyAnimator" 2014-07-02 20:52:43 +00:00
Nick Kralevich
63af727b4b Merge "Fix Issue 59989" 2014-07-02 20:52:43 +00:00
Nick Kralevich
b70888d455 Merge "Fix a typo in a javadoc comment" 2014-07-02 20:52:43 +00:00
Nick Kralevich
42b74e231d Merge "Typo in method name: Clone" 2014-07-02 20:51:20 +00:00
Nick Kralevich
3b345a6f91 Merge "Fix javadoc typo in Message.java: "arg1" -> "arg2"" 2014-07-02 20:51:20 +00:00
Brian Duff
a6e9dd3f9a Merge "Fix a typo in NumberPicker javadoc." 2014-07-02 20:51:20 +00:00
Baligh Uddin
bd66e55b10 Merge "Import translations. DO NOT MERGE" 2014-07-02 20:06:33 +00:00
Baligh Uddin
2e2090c5a2 am b33e23ea: (-s ours) am abef99cf: (-s ours) am 02c355d1: (-s ours) am 59db1767: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'b33e23ead7e9b9a1327168ffcca48a3cbe668398':
  Import translations. DO NOT MERGE
 2014-07-06 19:56:15 +00:00
Baligh Uddin
f4bf64bd2f am 660630f2: (-s ours) am 11281de7: (-s ours) am 89523569: (-s ours) am 314bfe07: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '660630f24251d62d13d13ce0301f5d2762414833':
  Import translations. DO NOT MERGE
 2014-07-06 19:56:09 +00:00
Baligh Uddin
442dbe962e Import translations. DO NOT MERGE 
Change-Id: I05f000d23e0e1e8d32c1d00e024c8d67b0a684f8
Auto-generated-cl: translation import
 2014-07-06 04:48:17 -07:00