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

120383 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Lesinski
4c488cca53 Merge "[Asset Manager] Fix memory leakage bug" 2014-06-17 05:00:50 +00:00
Dan Albert
7bd2992504 Use openssl's SHA1 instead of bionic's. 
Bionic is removing its SHA1.

Change-Id: I2b2d028223d2299666511a683cffba29c55639b7
 2014-06-16 17:01:21 -07:00
Chris Craik
0d28bb47d7 Merge "Fix the texture ID reuse issue in HWUI." 2014-06-16 22:13:20 +00:00
Chris Craik
5e7ef9489f Merge "hwui: fix possible null pointer de-refrence" 2014-06-16 22:13:20 +00:00
Colin Cross
18cd9f5762 clean up native com.android.internal.os.Zygote 
This is never compiled for the host any more, so remove all the
unnecesarry ifdefs.

Change-Id: I757e6d604b7f41476ac1021f5bdbc777eac6f99e
 2014-06-16 12:22:56 -07:00
Colin Cross
cb634bda7b Merge "clean up native com.android.internal.os.Zygote" 2014-06-16 15:34:52 +00:00
Tenghui Zhu
386caf6c8f Merge "update parameters in uploadToTexture() for GLES20" 2014-06-16 15:49:03 +00:00
sean_lu
7c57d23371 [Asset Manager] Fix memory leakage bug 
Symptom: memory leakage
Root Cause: new SortedVector but not free it in native cpp
Solution: free the SortedVector
Project: AOSP
Note:

Change-Id: Iab5a7f2e8d8509631301e7231427927d4797c856
 2014-06-16 15:11:29 +08:00
jiayuanr
4a473c7d94 Fix the texture ID reuse issue in HWUI. 
Issue: When the layer of previous frame is destroyed, it doesn't clear the
texture id in mBoundTextures[mTextureUnit], so in the next frame, if
glGenTexture returns same texture ID of the previous frame,
the new texture is not bound.

CRs-fixed: 671736

Change-Id: Ifc5fd2115fb1863b3c006ab14b0faabeaeb4eab4
 2014-06-16 09:29:22 +05:30
Nick Kralevich
748f4b8d42 Merge "update mLastSlash for gdbserver" 2014-06-13 23:54:51 +00:00
Nick Kralevich
195b23ef71 update mLastSlash for gdbserver 
the gdbserver special case wasn't updating mLastSlash. Fix it.

Change-Id: I63d64bb5f543bd2df6183649cf727e830731e144
 2014-06-13 16:24:58 -07:00
Digish Pandya
1fa4cef34a hwui: fix possible null pointer de-refrence 
add layer check for  null before de-refrencing it.

issue link: http://code.google.com/p/android/issues/detail?id=61622

Change-Id: I54fc21ec594effcfb1eededd80dd5b0b52645c4c
 2014-06-13 17:14:50 +05:30
Lu, Shenghua
c5e0a29541 update parameters in uploadToTexture() for GLES20 
Google optimized the uploadToTexture with GLES3.0+,
This allows us to upload a sub-rectangle of texture,
but this has compliance issue with GLES 2.0.

With OpenGL ES 2.0 we need to copy the bitmap in a
temporary buffer if the stride doesn't match the width,
and then upload entire temporary stripes.

Change-Id: I8987cd8347913c61b7fa45bd47be1189aa6bdb05
Signed-off-by: Shenghua Lu <shenghua.lu@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Guobin Zhang<guobin.zhang@intel.com>
 2014-06-13 09:42:33 +08:00
Tim Murray
77d28ca253 Merge "Move FieldPacker over to use large objects on 64-bit." 2014-06-12 05:34:11 +00:00
Tim Murray
4154bbd69b Move FieldPacker over to use large objects on 64-bit. 
Change-Id: I1d4d502a3f9d86c6cf0f516cc087b1457f86ac28
 2014-06-12 14:23:19 -07:00
Nick Kralevich
1ef888e564 Merge "Add service_contexts to policy update bundles." 2014-06-12 03:32:07 +00:00
Riley Spahn
5f5cf5f670 Add service_contexts to policy update bundles. 
Add service_context file to SELinuxPolicyInstallReceiver
to allow updating.

Bug: 12909011
Change-Id: Ic0ad89958cc750413787d57e0f51363212a8730b
 2014-06-12 20:46:34 +00: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
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
bfa6ddd02d Merge "Support deprecated language codes." 2014-06-11 15:59:20 +00:00
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
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
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
2f84b69bf5 Merge "Improved profile.start-immediately comment" 2014-06-10 21:16:15 +00:00
Robin Lee
94ca179eca Make misc config directory during user creation 
Directories will appear in /data/misc/user/XX, readable only by
applications within that user.

Change-Id: I0adb14deb1a035abdbe51714356bd0c94ccf04c5
 2014-06-10 18:48:05 +01:00
Calin Juravle
3f967910d9 Improved profile.start-immediately comment 
Change-Id: I41bda6a1cd99cb0a8230961e0462a41cb552887e
 2014-06-10 14:52:24 +01: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
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
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
d83ffe358d Merge "Add missing dependency in layoutlib build file [DO NOT MERGE]" 2014-06-06 19:34:13 +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
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
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
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
e46e600412 Merge "Assign AID_EVERYONE gid to newly-created processes" 2014-06-04 20:51:55 +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