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

124557 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
ed61958a25 am e1ef888e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'e1ef888eac66c247710833746f7e8e2fc1f45c1b':
  Import translations. DO NOT MERGE
 2014-07-02 15:08:10 +00:00
Baligh Uddin
0bd94e4b7a am 48f89343: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '48f89343d9abdaa81dcdbebd7a15b2b313d67aa7':
  Import translations. DO NOT MERGE
 2014-07-02 15:08:06 +00:00
Baligh Uddin
066fb41fc7 am caaf4aed: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'caaf4aed05163df62365d351e592083ba95102cd':
  Import translations. DO NOT MERGE
 2014-07-02 15:08:02 +00:00
Narayan Kamath
dbbc070670 am e2840977: am 6e84f8c1: Merge "Fix native crashes when APKs can\'t be opened." 
* commit 'e2840977d37e4d19425d448b54895536e43a2989':
  Fix native crashes when APKs can't be opened.
 2014-07-02 12:18:45 +00:00
Narayan Kamath
e2840977d3 am 6e84f8c1: Merge "Fix native crashes when APKs can\'t be opened." 
* commit '6e84f8c1b9c72ab6e1eb189358292237dbe1efe8':
  Fix native crashes when APKs can't be opened.
 2014-07-02 12:12:18 +00:00
Narayan Kamath
a8dbd7b433 am 39e4f590: am f56399f6: Merge "Fall back to "tl" if "fil" is absent." 
* commit '39e4f590787246ce35b995c0c0ce37b676a05e0c':
  Fall back to "tl" if "fil" is absent.
 2014-07-02 10:09:45 +00:00
Narayan Kamath
39e4f59078 am f56399f6: Merge "Fall back to "tl" if "fil" is absent." 
* commit 'f56399f6ab492c8c32b7ff9a8deeb2547f17f6da':
  Fall back to "tl" if "fil" is absent.
 2014-07-02 10:00:09 +00:00
Narayan Kamath
4161316f25 am 94171212: am 104da1e4: Merge "Fix broken assumptions in LocalePicker." 
* commit '94171212431a45346e40fd97bbe72422e71f04be':
  Fix broken assumptions in LocalePicker.
 2014-07-02 09:54:22 +00:00
Narayan Kamath
c61a7575eb am d62196cf: am 3fa99ec7: Merge "Remove bogus 2 char limit for locales and countries." 
* commit 'd62196cfeffe5e4d725b5388fca57a18c154a44b':
  Remove bogus 2 char limit for locales and countries.
 2014-07-02 09:51:54 +00:00
Narayan Kamath
9417121243 am 104da1e4: Merge "Fix broken assumptions in LocalePicker." 
* commit '104da1e495cbed81e7ebe66b80344bf916b02391':
  Fix broken assumptions in LocalePicker.
 2014-07-02 08:49:08 +00:00
Narayan Kamath
d62196cfef am 3fa99ec7: Merge "Remove bogus 2 char limit for locales and countries." 
* commit '3fa99ec77ee52164575375c7709923c94d9693a6':
  Remove bogus 2 char limit for locales and countries.
 2014-07-02 08:49:04 +00:00
Robert Ly
2e3b9d30d4 am 9b3bfb10: docs: updated expandedtext_combo 
* commit '9b3bfb1085770e558a31f9c4b1a6f9e6e34c8bc1':
  docs: updated expandedtext_combo
 2014-07-02 00:22:10 +00:00
Robert Ly
9b3bfb1085 docs: updated expandedtext_combo 
Change-Id: Ida3f08560710bf9d32fefd6797830f2258fed3c6
 2014-07-01 17:03:40 -07:00
Robert Ly
024d08ec12 am f077e7b7: Merge "docs: add more notification images" into klp-modular-dev 
* commit 'f077e7b719419271b5fd666c22b7d19177d6c325':
  docs: add more notification images
 2014-07-02 00:00:59 +00:00
Baligh Uddin
48f89343d9 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-07-01 23:33:37 +00:00
Baligh Uddin
e1ef888eac Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-07-01 23:17:33 +00:00
Baligh Uddin
caaf4aed05 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-07-01 23:17:33 +00:00
Brian Carlstrom
bd71bf1814 am 8922ddba: am a6e06889: Merge "Add profiler type options" 
* commit '8922ddbab1e394a59f957e8598fbbf88357e7838':
  Add profiler type options
 2014-07-01 22:37:18 +00:00
Brian Carlstrom
8922ddbab1 am a6e06889: Merge "Add profiler type options" 
* commit 'a6e06889fce7fbf2049f421daef02b8986736f77':
  Add profiler type options
 2014-07-01 22:32:01 +00:00
Chris Craik
86b55c52c7 Fix klp-modular-dev-plus-aosp build 
Change-Id: I546dfef29b5875633de18f6a7e3f419a0d012faa
 2014-07-01 15:24:37 -07:00
Nick Kralevich
db32fb646d am d172419e: am 9b1a7d45: Merge "Allow different SELinux policies for third party apps." 
* commit 'd172419e9a36f61af8c98d316ec2625e1f1304f6':
  Allow different SELinux policies for third party apps.
 2014-07-01 21:16:14 +00:00
Nick Kralevich
d172419e9a am 9b1a7d45: Merge "Allow different SELinux policies for third party apps." 
* commit '9b1a7d4570dd692cf86c385dfcdf057ad966fa57':
  Allow different SELinux policies for third party apps.
 2014-07-01 21:13:12 +00:00
Nick Kralevich
9b1a7d4570 Merge "Allow different SELinux policies for third party apps." 2014-07-01 19:16:01 +00:00
Robert Craig
83b54ecab7 Allow different SELinux policies for third party apps. 
Prior support forced all third party apps
to be resolved against the default stanza
of the mac_permissions.xml file when assigning
seinfo labels. This meant that all third party
apps, in effect, were untrusted regardless of
cert and therefore received the same selinux domain.
This also had the unfortunate side effect of forcing
certain third party apps into the wrong domains
because of shared userid requests among apps.

This patch removes that restriction and instead
allows all apps, regardless of location, to be
matched against the full mac_permissions.xml
policy file. This then allows all apps signed
with known good certs to receive the same selinux
domains of other apps with whom they share trust.

Change-Id: Iba569c046135c0e81140faf6296c5da26a243037
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
 2014-07-01 13:53:11 -07:00
Baligh Uddin
24280fa4c0 Import translations. DO NOT MERGE 
Change-Id: I006181afb024c03d268793fe4a8f547d9ee82d6b
Auto-generated-cl: translation import
 2014-07-01 11:22:35 -07:00
Marco Nelissen
1ed64c65a7 am 899c15ef: am db816cef: Merge "Make sure we clean up" 
* commit '899c15ef2053f0cebfeda90b5211e80310e6f278':
  Make sure we clean up
 2014-07-01 18:21:41 +00:00
Baligh Uddin
cd008483a3 Import translations. DO NOT MERGE 
Change-Id: I71e375bba32fd94ba872c7f5f35f338470a53524
Auto-generated-cl: translation import
 2014-07-01 11:15:32 -07:00
Marco Nelissen
899c15ef20 am db816cef: Merge "Make sure we clean up" 
* commit 'db816cef0dd1f1988fbcf3c70a66f9c4acf73358':
  Make sure we clean up
 2014-07-01 18:15:28 +00:00
Baligh Uddin
b77da19e59 am b9246ef5: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'b9246ef52c7f8ea7c4888c0f45005a49792a8614':
  Import translations. DO NOT MERGE
 2014-07-01 18:14:47 +00:00
Baligh Uddin
5b3e66d0f6 am 9846e4c6: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '9846e4c676e9b1b656081bab3f9cb304f8cc3cdf':
  Import translations. DO NOT MERGE
 2014-07-01 18:14:40 +00:00
Baligh Uddin
3bb733baa2 am 4a4fa0a3: (-s ours) Import translations. DO NOT MERGE 
* commit '4a4fa0a30a4d53816fcb56545054d624f3243cb6':
  Import translations. DO NOT MERGE
 2014-07-01 18:14:36 +00:00
Baligh Uddin
43380b20e7 Import translations. DO NOT MERGE 
Change-Id: I827912aaef1d4a9bd0d38cdcbc24143d91704b56
Auto-generated-cl: translation import
 2014-07-01 11:14:28 -07:00