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
ca2197b045 Update javadoc for android.os.Bundle. 
Call out the fact that defaultValue is returned if a null
mapping exists for a given key.

bug: https://code.google.com/p/android/issues/detail?id=68453
Change-Id: Ifa6e94c1dee47809f70cadcb668cb98cb8dbef14
 2014-06-19 10:46:00 +01:00
Stephen Hines
ff83ed2dc3 am b02dadd4: Merge "Create FieldPacker.getPos() to get the actual amount of data used for FP." 
* commit 'b02dadd47c20b65569413cb4575c6050fe7b609f':
  Create FieldPacker.getPos() to get the actual amount of data used for FP.
 2014-06-19 03:13:37 +00:00
Brian Carlstrom
f8077cf2d7 am 8e21e215: Merge "Switch from core to core-libart" 
* commit '8e21e21550eddce01ad06fdf05b342993bf44c6a':
  Switch from core to core-libart
 2014-06-19 02:03:35 +00:00
Jason Sams
802aaf3b9d am 47de3060: Merge "Fix element size on 64b" 
* commit '47de306050576535014ff2b0c08006f951eea2ee':
  Fix element size on 64b
 2014-06-18 22:54:08 +00:00
Stephen Hines
b02dadd47c Merge "Create FieldPacker.getPos() to get the actual amount of data used for FP." 2014-06-18 22:48:04 +00:00
Jeff Sharkey
b5e05cffcc Merge "Fixing parcel leaks to avoid virtual memory leak" 2014-06-18 22:48:04 +00:00
Maunik Shah
db1a9a3862 Fixing parcel leaks to avoid virtual memory leak 
Client has to call recycle() on parcel object after its usage
otherwise native layer of binder won't clear the resources of
parcel which were allocated for IPC

Change-Id: Ib31ddcc92aa4ebd80bb66729922b9133692e9c9e
 2014-06-19 19:44:21 +05:30
Brian Carlstrom
8e21e21550 Merge "Switch from core to core-libart" 2014-06-18 22:48:04 +00:00
Brian Carlstrom
dbcae5ceb7 Switch from core to core-libart 
Bug: 14298175
Change-Id: I89db18bf3d88f9511cb2ad943c64ecdbaf09d96f
 2014-06-18 17:43:27 -07:00
Stephen Hines
fa1275a6e7 Create FieldPacker.getPos() to get the actual amount of data used for FP. 
We need larger buffers to handle 64-bit RS object types, but 32-bit code
will never fill all of the getData().length bytes. This allows us to retain
our verification code.

We have to modify an existing use of FieldPacker that was doing partial
updates of the underlying buffer. This was really relying on the old data
to be implicitly selected and written back, but that is not guaranteed by
the original API. This also required a fix to the FieldPacker.reset() API,
which was not allowing the FieldPacker to ever point to the final entry in
its buffer.

Change-Id: Idcd52790ac2b0ab1eff3f043e7eec2832953f04b
 2014-06-18 00:24:44 -07:00
Colin Cross
15967d0a8f am 88b37eda: Merge "Fix reading memory usage for 64-bit processes" 
* commit '88b37edaeab7b31cab0f5115e5c9f63a49991408':
  Fix reading memory usage for 64-bit processes
 2014-06-17 22:47:50 +00:00
Colin Cross
88b37edaea Merge "Fix reading memory usage for 64-bit processes" 2014-06-17 21:47:03 +00:00
Colin Cross
0c6bc73c5e Fix reading memory usage for 64-bit processes 
64-bit process will have virtual addresses that don't fit in an
unsigned long if ActivityManagerService is in a 32-bit process,
and the locations of the '-' and ' ' characters in the maps
are not predictable.  Fix the sscanf for finding the start of the
mapping, and use it again to find the end of the mapping.  Also
fix a few 64-bit warnings.

Change-Id: I8855c76085142768be1d45346f1032fd37cbe4eb
 2014-06-17 15:25:45 -07:00
Jason Sams
47de306050 Merge "Fix element size on 64b" 2014-06-17 21:42:00 +00:00
Jason Sams
b49dfeaea9 Fix element size on 64b 
RenderScript Element types know their own size.  This
change properly tracks the new object sizes.

Change-Id: I3cbf76a7ec5f68056ed5599e9406cea05ba86969
 2014-06-18 13:17:57 -07:00
Adam Lesinski
51736de19a am 4c488cca: Merge "[Asset Manager] Fix memory leakage bug" 
* commit '4c488cca531f209921cc4dfbc27ff7cdecfda71b':
  [Asset Manager] Fix memory leakage bug
 2014-06-17 19:08:50 +00:00
Narayan Kamath
8df5bd08c2 Explicitly list out the list of cache subdirs to prune. 
We don't want directories like profiles and the former
profile-cache from being included in the prune. SELinux would
have prevented the move, but that's very brittle.

bug: 15677279

Change-Id: I2ff5db056757ffacaf108bb07b02dc0cac7172dd
 2014-06-17 13:07:45 +01:00
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
e709d53ff3 am 0d28bb47: Merge "Fix the texture ID reuse issue in HWUI." 
* commit '0d28bb47d771a2ac99cec6e4a071a98d2cd705dd':
  Fix the texture ID reuse issue in HWUI.
 2014-06-16 23:43:21 +00:00
Chris Craik
b1fc06a432 am 5e7ef948: Merge "hwui: fix possible null pointer de-refrence" 
* commit '5e7ef9489f3247c02395202d88fb4fb425aa8412':
  hwui: fix possible null pointer de-refrence
 2014-06-16 23:43:16 +00: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
a803542aad am cb634bda: Merge "clean up native com.android.internal.os.Zygote" 
* commit 'cb634bda7b0130015509b0e4d236d10b20b2340d':
  clean up native com.android.internal.os.Zygote
 2014-06-16 20:14:40 +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
Tenghui Zhu
df36dd200c am 386caf6c: Merge "update parameters in uploadToTexture() for GLES20" 
* commit '386caf6c8f276f1d03ea077bc799df2a937ef500':
  update parameters in uploadToTexture() for GLES20
 2014-06-16 17:13:53 +00:00
Tim Murray
080671c538 DO NOT MERGE: Mark new util type functions as @hide in AOSP. 
Change-Id: I834e07aef142aa79ed1603535689d0b833357f6c
 2014-06-16 09:55:50 -07:00
Tenghui Zhu
386caf6c8f Merge "update parameters in uploadToTexture() for GLES20" 2014-06-16 15:49:03 +00:00
Colin Cross
cb634bda7b Merge "clean up native com.android.internal.os.Zygote" 2014-06-16 15:34:52 +00:00
Narayan Kamath
6a6411e3d8 am 076dc013: Merge "Move dex file pruning to installd." 
* commit '076dc0135b153cbcedbe584645c93cfe4390cdb0':
  Move dex file pruning to installd.
 2014-06-16 13:50:37 +00:00
Narayan Kamath
f36fe3f85d am 1083573c: Merge "Track changes to libcore ICU apis." 
* commit '1083573c2feb6677ae5627a9ee41f82a697e22d4':
  Track changes to libcore ICU apis.
 2014-06-16 10:56:34 +00:00
Narayan Kamath
8382b0d3c6 am ab9a19e3: Merge "Remove some pointless code." 
* commit 'ab9a19e38c685d0cb2952185af510322b26181a7':
  Remove some pointless code.
 2014-06-16 09:47:10 +00:00
Narayan Kamath
031dec4acd am bfa6ddd0: Merge "Support deprecated language codes." 
* commit 'bfa6ddd02d699f43915cba8027ab324d234b4836':
  Support deprecated language codes.
 2014-06-16 09:39:57 +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
23315095f1 am 748f4b8d: Merge "update mLastSlash for gdbserver" 
* commit '748f4b8d42541955850e76972b1ab3d9c98e226d':
  update mLastSlash for gdbserver
 2014-06-14 04:25:46 +00:00
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
b1c9430c87 am 77d28ca2: Merge "Move FieldPacker over to use large objects on 64-bit." 
* commit '77d28ca25378530f92d409fbd72a38a1e256b59f':
  Move FieldPacker over to use large objects on 64-bit.
 2014-06-12 23:05:16 +00:00
Nick Kralevich
9a0485aa56 am 1ef888e5: Merge "Add service_contexts to policy update bundles." 
* commit '1ef888e564926b78aeb02ef1085be2f72227b862':
  Add service_contexts to policy update bundles.
 2014-06-12 21:07:25 +00: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
8525fe8d0a am 1a3908e9: Merge "Switch to a type-safe album art interface." 
* commit '1a3908e95926acd8add3858be571fe23fa9d047a':
  Switch to a type-safe album art interface.
 2014-06-12 00:02:42 +00:00
Calin Juravle
b0492d6943 am 16719591: Merge "Shrink profiler.start-immediately to fit in the maximum property size" 
* commit '16719591f4a6b2139b1f3555dcde92d35f488b6a':
  Shrink profiler.start-immediately to fit in the maximum property size
 2014-06-11 17:28:33 +00:00
Calin Juravle
b0f59cdcb4 am 2f84b69b: Merge "Improved profile.start-immediately comment" 
* commit '2f84b69bf5afcf67469704e30866067b770ae786':
  Improved profile.start-immediately comment
 2014-06-11 17:28:29 +00:00
Narayan Kamath
bfa6ddd02d Merge "Support deprecated language codes." 2014-06-11 15:59:20 +00:00