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

120310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
e79c8ce682 Support deprecated language codes. 
Locale.toLanguageTag will transform the obsolete (and
deprecated) language codes "in", "ji" and "iw" to
"id", "yi" and "he" respectively.

All versions of android prior to "L" used the deprecated
language tags, so we will need to support them for backwards
compatibility.

bug: 13230947

(cherry-picked from commit 21fc8ba39c4799a346caf95)

(also contains a partial cherry-pick of 857ba4af because
including it is the easiest way to avoid conflicts.)

Change-Id: Ia1d0f2d8e20f5679ff3990506f6468ebf789c94a
 2014-06-13 19:03:13 +01:00
Elliott Hughes
1a3908e959 Merge "Switch to a type-safe album art interface." 2014-06-10 21:55:12 +00:00
Elliott Hughes
95d3f86fed Switch to a type-safe album art interface. 
(Requires a matching change in frameworks/av.)

Bug: 15514223
Change-Id: I4e494cc5d7a2eb82cd2b7ae3b829fc663136267a
 2014-06-11 14:43:57 -07:00
Narayan Kamath
1083573c2f Merge "Track changes to libcore ICU apis." 2014-06-10 21:26:11 +00:00
Narayan Kamath
2c9d2005ec Track changes to libcore ICU apis. 
All private APIs that earlier accepted Locale.toString
now accept Locale instances.

Change-Id: I80df88d0c928e921320b6545b1267adecefe64af
 2014-06-12 13:42:05 +01:00
Calin Juravle
16719591f4 Merge "Shrink profiler.start-immediately to fit in the maximum property size" 2014-06-10 21:26:11 +00:00
Calin Juravle
994cd28e72 Shrink profiler.start-immediately to fit in the maximum property size 
Change-Id: I25f24f5e5b128aa6a300bdc1008427451bd9cecf
 2014-06-11 18:21:41 +01:00
Narayan Kamath
ab9a19e38c Merge "Remove some pointless code." 2014-06-10 21:16:15 +00:00
Narayan Kamath
d9d0bb64e7 Remove some pointless code. 
Unnecessary disk reads for values that are never
used (and cached elsewhere, so that optimization is
rendered pointless).

Change-Id: Ic14a8b53a96908bb03eae28759d7be2c217e8125
 2014-06-13 17:46:47 +01:00
Narayan Kamath
076dc0135b Merge "Move dex file pruning to installd." 2014-06-10 21:16:15 +00:00
Narayan Kamath
5b95e02684 Move dex file pruning to installd. 
Companion change for commit 7dbf95cd7606e22267
in frameworks/native.

bug: 14407732
Change-Id: I520aa3950fb6b87c7ca5a805e597d734496407d3
 2014-06-16 13:59:21 +01:00
Calin Juravle
2f84b69bf5 Merge "Improved profile.start-immediately comment" 2014-06-10 21:16:15 +00:00
Calin Juravle
3f967910d9 Improved profile.start-immediately comment 
Change-Id: I41bda6a1cd99cb0a8230961e0462a41cb552887e
 2014-06-10 14:52:24 +01:00
Elliott Hughes
de1f00231f am 2a1ed46d: Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt." 
* commit '2a1ed46decbc8e21a39367a4b7770111392167c3':
  Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.
 2014-06-09 16:30:03 +00:00
Elliott Hughes
2a1ed46dec Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt." 2014-06-09 16:26:28 +00:00
Elliott Hughes
e0f2fa33d7 Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt. 
Change-Id: I1acb4d5df71daa47ea87813db3941fd3c676cfb5
 2014-06-09 09:22:58 -07:00
Robin Lee
db9e0a674a am 01c07a85: Merge "Choose CA certificate storage according to userId" 
* commit '01c07a856de163dc9a6fd31ea4b42293d221ee63':
  Choose CA certificate storage according to userId
 2014-06-09 12:51:19 +00:00
Robin Lee
01c07a856d Merge "Choose CA certificate storage according to userId" 2014-06-09 12:47:08 +00:00
Robin Lee
3d076afc37 Choose CA certificate storage according to userId 
Sets the default CA certificate directory at first instantiation so
that only certificates for the current user are searched.

This means that if one user decides to trust a CA no other user of the
device will be forced into trusting that CA as well.

Change-Id: Iaca14a94dd14c598e49a598290e1a80917269eac
 2014-06-09 12:45:17 +00:00
Calin Juravle
337f97bedc am 97f7f24c: Merge "Fixed comments related to profile properties." 
* commit '97f7f24c9d9ea35a2e360fb86beb0a9fca4fc2d7':
  Fixed comments related to profile properties.
 2014-06-09 09:23:18 +00:00
Calin Juravle
97f7f24c9d Merge "Fixed comments related to profile properties." 2014-06-09 09:18:23 +00:00
Calin Juravle
de99f08f65 Fixed comments related to profile properties. 
Change-Id: Idd6de8fe2a193a36cf1ea6bcadacb3289973c5ab
 2014-06-09 10:13:55 +01:00
Ian Rogers
74de10a0f2 am d83ffe35: (-s ours) Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" 
* commit 'd83ffe358db81abbde44ec38cd9121e67d25fbb3':
  Add missing dependency in layoutlib build file [DO NOT MERGE]
 2014-06-06 19:42:12 +00:00
Ian Rogers
d83ffe358d Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" 2014-06-06 19:34:13 +00:00
Calin Juravle
d1d46d9d55 am bbf849b1: Merge "Add missing profiler options." 
* commit 'bbf849b1c686c9e09c4d59574da70181a47ebb5d':
  Add missing profiler options.
 2014-06-06 12:09:48 +00:00
Calin Juravle
bbf849b1c6 Merge "Add missing profiler options." 2014-06-06 12:06:36 +00:00
Calin Juravle
9828d067fb Add missing profiler options. 
Bug: 12877748

Change-Id: I311b8fb7e15d512e65631bc2a52c443a271d3d3f
 2014-06-06 12:55:23 +01:00
Deepanshu Gupta
b78cc30920 Add missing dependency in layoutlib build file [DO NOT MERGE] 
Add missing dependency on built_ext_data

Change-Id: I4e7cca7f6cbc7f5b7416ac9b85a9aec01e61ecd4
(cherry picked from commit e345507ca4b7b83c6e0446788f4404eb697f945b)
 2014-06-05 18:32:14 -07:00
Elliott Hughes
bd1949a4fb am b2842e72: Merge "[LP64] Fix access to MediaAlbumArt." 
* commit 'b2842e72819b3eb724503290e9eaa7c50f65e45b':
  [LP64] Fix access to MediaAlbumArt.
 2014-06-05 18:19:16 +00:00
Elliott Hughes
b2842e7281 Merge "[LP64] Fix access to MediaAlbumArt." 2014-06-05 18:02:04 +00:00
Elliott Hughes
9fa803be10 [LP64] Fix access to MediaAlbumArt. 
The mSize field is a uint32_t, not a long.

Change-Id: Id3b9e6049e8998840d33fa886b676db2a8022064
 2014-06-05 10:38:30 -07:00
Robin Lee
3c189e02e4 am 271251d7: Merge "Add Environment call: get config dir for some user" 
* commit '271251d739db12838d1521bcf885b4943e9b00b1':
  Add Environment call: get config dir for some user
 2014-06-05 17:26:29 +00:00
Robin Lee
271251d739 Merge "Add Environment call: get config dir for some user" 2014-06-05 17:16:52 +00:00
Robin Lee
6959133d84 Add Environment call: get config dir for some user 
This returns a read-only directory accessible to any app running as the
same user, containing various configuration files written by the system.

Change-Id: I635de184fc285b8fef166b782bbc1ac79f8f0687
 2014-06-05 14:34:23 +00:00
Elliott Hughes
38a5a257a9 am 759a8978: Merge "Minor javadoc improvements for PackageManager." 
* commit '759a89782d38ddf6ab7f4a2c22c8911ea206b275':
  Minor javadoc improvements for PackageManager.
 2014-06-04 21:46:12 +00:00
Elliott Hughes
c1973c2888 am c0f4ac1b: Merge "Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag" 
* commit 'c0f4ac1bb8668702fa0f053d0ca219bab7dde67c':
  Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag
 2014-06-04 21:29:08 +00:00
Elliott Hughes
759a89782d Merge "Minor javadoc improvements for PackageManager." 2014-06-04 21:26:49 +00:00
Elliott Hughes
c0f4ac1bb8 Merge "Delete duplicate SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION flag" 2014-06-04 21:13:57 +00:00
Robin Lee
4891a9f9cf am e46e6004: Merge "Assign AID_EVERYONE gid to newly-created processes" 
* commit 'e46e60041215249a285384cd2282de9f4d956a04':
  Assign AID_EVERYONE gid to newly-created processes
 2014-06-04 20:55:02 +00:00
Robin Lee
e46e600412 Merge "Assign AID_EVERYONE gid to newly-created processes" 2014-06-04 20:51:55 +00:00
Tim Murray
af2e7bc2e0 am fdb15a76: (-s ours) DO NOT MERGE: Mark new util type functions as @hide in AOSP. 
* commit 'fdb15a76a30de169aac63d4c2260aa293477557e':
  DO NOT MERGE: Mark new util type functions as @hide in AOSP.
 2014-06-04 17:39:54 +00:00
Tim Murray
fdb15a76a3 DO NOT MERGE: Mark new util type functions as @hide in AOSP. 
Change-Id: I834e07aef142aa79ed1603535689d0b833357f6c
 2014-06-04 10:25:54 -07:00
Amaury Medeiros
dde24269c1 Minor javadoc improvements for PackageManager. 
- Removed duplicated use of the word "the".
- Changed @return and @param explanation of getApplicationEnabledSetting,
which should get the enabled state of an application and not just one component.

Change-Id: Ide07ec84ceb5b9b5caa28efa9ba838a40ee7b514
Signed-off-by: Amaury Medeiros <amaurymedeiros@gmail.com>
 2014-06-03 20:06:41 -03:00
Tim Murray
1afc29ae38 Merge "Add support for mixed 32/64 APKs using RenderScript." 2014-06-03 21:36:19 +00:00
Adam Lesinski
7e547e0d72 Merge "Add --pseudo-localize option to generate resources for pseudolocales." 2014-06-03 20:11:13 +00:00
Tim Murray
f0c62b2676 Add support for mixed 32/64 APKs using RenderScript. 
Change-Id: I8901a1547d180c9dcef320f86d07a5b82551fb5c
 2014-06-03 12:30:53 -07:00
Igor Viarheichyk
a191d0464f Add --pseudo-localize option to generate resources for pseudolocales. 
Update help output with new option, remove mention of obsolete zz_ZZ
pseudolocale.

Change-Id: Ie2cfc8d11ef6a57e2b9a2333514a7340a3a8c075
 2014-06-03 12:07:50 -07:00
Narayan Kamath
73f7cd98d6 Merge "Fix build." 2014-06-03 13:56:03 +00:00
Narayan Kamath
26c6c03196 Fix build. 
Bad resolution of a manual rebase.

Change-Id: I56d4c7a343c8fd7a715f983b2db15767849f9af7
 2014-06-03 14:54:52 +01:00
Narayan Kamath
7cb13f8a0a Merge "Scan for renderscript files before deciding ABIs." 2014-06-03 12:20:05 +00:00