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

124793 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Narayan Kamath
104da1e495 Merge "Fix broken assumptions in LocalePicker." 2014-07-01 17:57:26 +00:00
Narayan Kamath
3fa99ec77e Merge "Remove bogus 2 char limit for locales and countries." 2014-07-01 17:52:00 +00:00
Narayan Kamath
6e84f8c1b9 Merge "Fix native crashes when APKs can't be opened." 2014-07-01 17:48:27 +00:00
Narayan Kamath
f56399f6ab Merge "Fall back to "tl" if "fil" is absent." 2014-07-01 17:48:27 +00:00
Narayan Kamath
e4345dbd2a Fall back to "tl" if "fil" is absent. 
For JB-MR1, there was a hack that used "tl" where
we really meant "fil" because ICU didn't have localizations
for "fil". This has now been fixed, and we now support 3 letter
language codes for AAPT so we can use "fil" where required.

For the benefit of apps that need to target older platforms,
we fall back to "tl" if the app has assets for "tl" and the
resource locale is "fil".

See bugs 7291355, 7207176 and 8049507 for more context.

Change-Id: I1ac8502525f99b40f9091d5efd2df33518d47a41
 2014-07-02 10:53:43 +01:00
Baligh Uddin
4a4fa0a30a Import translations. DO NOT MERGE 
Change-Id: I1027a88bab0d00d223807bba87f9bbb75aef4d79
Auto-generated-cl: translation import
 2014-07-01 10:47:53 -07:00
Marco Nelissen
db816cef0d Merge "Make sure we clean up" 2014-07-01 14:59:07 +00:00
Brian Carlstrom
a6e06889fc Merge "Add profiler type options" 2014-07-01 14:58:13 +00:00
Baligh Uddin
9846e4c676 Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-07-01 14:50:43 +00:00
Baligh Uddin
efee5db3c7 Import translations. DO NOT MERGE 
Change-Id: I7ad5171c74ba22fff8602cf99b6a87f93f0f86a0
Auto-generated-cl: translation import
 2014-07-01 10:45:41 -07:00
Robert Ly
f077e7b719 Merge "docs: add more notification images" into klp-modular-dev 2014-07-01 14:48:56 +00:00
Robert Ly
528f2aafb3 docs: add more notification images 
Change-Id: Ia71ef7783c89da319a9179a4f1c4ab197df818c5
 2014-07-01 16:52:56 -07:00
Baligh Uddin
b9246ef52c Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-07-01 14:40:15 +00:00
Baligh Uddin
a9b6277c10 Import translations. DO NOT MERGE 
Change-Id: I8995e4e7008c4ec3c06e6ef65046d8fc9987c33a
Auto-generated-cl: translation import
 2014-07-01 10:44:30 -07:00
Narayan Kamath
37151b5032 Remove bogus 2 char limit for locales and countries. 
Locale settings are persisted to system properties
and not to system settings, so the values read here
are used pretty much everywhere.

bug: 15873165
bug: 10090157

Change-Id: Ie7cda166439112c615afbd38253cf4fbb5791242
 2014-07-01 13:50:18 +01:00
Narayan Kamath
8c1c0a6881 am 7f319c47: am 1dc550fa: Merge "Fix packing of values at offset 16." 
* commit '7f319c47c8f5e947638eb1e5e73789ff83123bba':
  Fix packing of values at offset 16.
 2014-07-01 10:23:44 +00:00
Narayan Kamath
b27c137087 Fix broken assumptions in LocalePicker. 
This code assumed that the locale is always 5 chars in
length and was of the form xx-YY. This is not necessarily
true. The language can be 3 letters in length and the locale
might have a script and variant.

Also cleans up several nasty pieces of code and eliminates
unnecessary array copies and improves readability by using
idiomatic java.

bug: 15873165
bug: 10090157

Change-Id: Iab1cfd7b78e5772b1245654f2153caf63a96033d
 2014-07-01 11:12:24 +01:00
Narayan Kamath
7f319c47c8 am 1dc550fa: Merge "Fix packing of values at offset 16." 
* commit '1dc550fa7333257a130d71866be37181f8ee553b':
  Fix packing of values at offset 16.
 2014-07-01 09:22:10 +00:00
Robert Ly
9baaf2ce84 am 7459dfed: Merge "docs: add new UX images for notifications and wear" into klp-modular-dev 
* commit '7459dfed6c4353a9437f5c5fbbbc1738f465a432':
  docs: add new UX images for notifications and wear
 2014-07-01 02:52:30 +00:00
Robert Ly
7459dfed6c Merge "docs: add new UX images for notifications and wear" into klp-modular-dev 2014-06-30 22:24:07 +00:00
Robert Ly
bdc5428410 docs: add new UX images for notifications and wear 
Change-Id: I936209db7260c77aec425f3457497cd70a66b767
 2014-06-30 19:33:37 -07:00
Quddus Chong
62395c9379 am 5212ee08: Merge "docs: Add Javadocs for GMS Longhorn." into klp-modular-dev 
* commit '5212ee08f3061c07a6a323e9169b63b596c4c824':
  docs: Add Javadocs for GMS Longhorn.
 2014-06-30 21:51:32 +00:00
Quddus Chong
69fc782a8b am 85a25e02: Merge "docs: Added "What\'s New" for GMS Longhorn (Google Play Services 5.0)" into klp-modular-dev 
* commit '85a25e02004f77595e352e03c1fdb11b6126db69':
  docs: Added "What's New" for GMS Longhorn (Google Play Services 5.0)
 2014-06-30 21:51:28 +00:00
Tim Kilbourn
6f1a231a0b am 326b1857: Merge "Fix docs" into klp-modular-dev 
* commit '326b1857a5ced49f249358751e05ce237bfaefc8':
  Fix docs
 2014-06-30 20:54:30 +00:00
Robert Ly
07fd3652aa am e1e35d13: docs: fix notifications docs 
* commit 'e1e35d13023224c22a54ce074c45d2f8729b1c60':
  docs: fix notifications docs
 2014-06-30 20:17:33 +00:00
Robert Ly
e1e35d1302 docs: fix notifications docs 
Change-Id: I14f55619ae0e0c53811c09410fec5ef8bf577ff6
 2014-06-30 13:11:39 -07:00
Quddus Chong
5212ee08f3 Merge "docs: Add Javadocs for GMS Longhorn." into klp-modular-dev 2014-06-30 17:43:33 +00:00