25fb0a9b4643a21a83339ad7cd18c0591f9f6a05 |
|
21-Jan-2016 |
Chenjie Luo <cjluo@google.com> |
Merge "Fix bug in AssetAtlas packing loop" into cw-e-dev am: b2b2fb0182 am: 8d6f1956e4 am: bf9a587ca8 am: 5d092a1356 * commit '5d092a1356f76a43d2411d5f4a6f8309b634e1d4': Fix bug in AssetAtlas packing loop
|
e66554d4be58ce548085487c031cf4d1eb9f76ae |
|
20-Jan-2016 |
Chenjie Luo <cjluo@google.com> |
Fix bug in AssetAtlas packing loop There is a bug in AssetAtlasService that it always choose the MAX_SIZE as height. The for loop of height calculation starts from MAX_SIZE and breaks when it finds a working texture. This means the height loop will always break for the initial value. Reording the loop optimize the algorithm to find a smaller atlas texture. The MIN_SIZE is also changed to 512 for fewer assets case. Bug: 26429912 Change-Id: Ic0b2396e9697c417a24f81ec792f8a8af53915ad
/frameworks/base/services/core/java/com/android/server/AssetAtlasService.java
|
c5967e9862489024c932b0c7fcb84ed0af2a7fd7 |
|
08-Jan-2016 |
Jeff Sharkey <jsharkey@android.com> |
More progress on triaging PackageManager callers. Catch a bunch of simple cases where the PackageManager flags are obvious. Add the ability to use the MATCH_SYSTEM_ONLY flag on PackageInfo and ApplicationInfo queries. Re-examine recent tasks after a user is unlocked, since some of the activities may now be available and runnable. Bug: 26471205, 26253870 Change-Id: I989d9f8409070e5cae13202b47e2c7de85bf4a5b
/frameworks/base/services/core/java/com/android/server/AssetAtlasService.java
|
c360bef7bcf98e0ae50461524f1ae08ee3a9c609 |
|
22-Jul-2015 |
John Reck <jreck@google.com> |
Fix ATLAS_MAP_ENTRY_FIELD_COUNT Bug: 22558805 Change a039182d6157bc0487df4ad8e373685c9dd7d662 reduced the size of an entry from 4 fields to 3, but failed to update the constant that determined the size of the java long[]. Because the long[] is blindly passed down through to native, this will result in reading past the end of the array as the size is no longer a multiple of the number of fields being read so the loop will not terminate until 1 iteration past the end. Change-Id: I2f8e26cec9a60b3a74739a3763203296be5f1fd6
/frameworks/base/services/core/java/com/android/server/AssetAtlasService.java
|
a039182d6157bc0487df4ad8e373685c9dd7d662 |
|
07-May-2015 |
John Reck <jreck@google.com> |
Delete a bunch of dead code Rotation wasn't supported, so just nuke all the code around it. Fixes some unused field warnings Change-Id: Ic33d56ed3b42e3261bddc5007c5a029831254f83
/frameworks/base/services/core/java/com/android/server/AssetAtlasService.java
|
c6e2e8ff474ae44bab5b9eb665851118abd27b68 |
|
15-Apr-2015 |
John Reck <jreck@google.com> |
Move AssetAtlas off of SkBitmap* Switched to SkPixelRef* Change-Id: I4a1d9dc6c55c1ebcce6b0b8c585e69559e523898
/frameworks/base/services/core/java/com/android/server/AssetAtlasService.java
|
c1b33d665c8caf5760f68c45c6ca0baa649b832a |
|
22-Apr-2015 |
John Reck <jreck@google.com> |
GraphicsJNI Canvas cleanup Change-Id: I72e142986a8bc9f464c1951b6b5187919de3462e
/frameworks/base/services/core/java/com/android/server/AssetAtlasService.java
|
9d4efdf2802f06ccf7031610891f75af70ea5538 |
|
17-Apr-2015 |
John Reck <jreck@google.com> |
Revert "A bunch more cleanups" This reverts commit c294d128d03bc9a9982b273a82516c04583438cc. Change-Id: Id1ebb236950f7c36c6d86e1dd95566d3a200748d
/frameworks/base/services/core/java/com/android/server/AssetAtlasService.java
|
7809f835cae637c12eebdc92103ad88890228d97 |
|
17-Apr-2015 |
John Reck <jreck@google.com> |
Revert "Move AssetAtlas off of SkBitmap*" This reverts commit 87ffb63d90fb6dd2689fe72dcb24fda9a6156220. Change-Id: I92adfcee454a0a19020cdd9e96a134be0ee529aa
/frameworks/base/services/core/java/com/android/server/AssetAtlasService.java
|
87ffb63d90fb6dd2689fe72dcb24fda9a6156220 |
|
15-Apr-2015 |
John Reck <jreck@google.com> |
Move AssetAtlas off of SkBitmap* Switched to SkPixelRef* Change-Id: I4a1d9dc6c55c1ebcce6b0b8c585e69559e523898
/frameworks/base/services/core/java/com/android/server/AssetAtlasService.java
|
c294d128d03bc9a9982b273a82516c04583438cc |
|
14-Apr-2015 |
John Reck <jreck@google.com> |
A bunch more cleanups Switch a few places to using android::canvas instead of SkCanvas as well which eliminated some JNI Change-Id: I8f98b56442a06362b82b984cd1bd3a92398d8dbc
/frameworks/base/services/core/java/com/android/server/AssetAtlasService.java
|
ab7f01d51b9dbb031bddaa10f32b070942cd57e0 |
|
07-Apr-2015 |
Xiaohui Chen <xiaohuic@google.com> |
fix a potential race condition Currently worker threads in computeBestConfiguration may NOT completely finish before timeout. But the code will start using the result while the worker threads are still working on the same object. This may cause exceptions. b/19966623 Change-Id: I62ffcb796d648891ee339b6a978f575ebad8352b
/frameworks/base/services/core/java/com/android/server/AssetAtlasService.java
|
072be09aafc258a8d9d8c4f1dbf4f800b3983434 |
|
01-Apr-2015 |
ztenghui <ztenghui@google.com> |
Start searching the dimension configuration for atlas from the biggest value. The old way will almost always miss the MAX_SIZE * MAX_SIZE case. Most of time, it will be fine. But if the threshold is just fall a bit short from MAX_SIZE * MAX_SIZE, then it is likely that no generated configuration can be bigger than the threshold. At the same time, a power of 2 size texture is more likely be used in the new way. Better for memory alignment (or usage) and potential performance. b/19966623 Change-Id: I4683fd5dea347158bc05d95cc7d777cc391b7fba
/frameworks/base/services/core/java/com/android/server/AssetAtlasService.java
|
f4faeac3525fe1ce3707ab785a1651aec367589d |
|
05-Mar-2015 |
John Reck <jreck@google.com> |
Cleanup Bitmap JNI attempt #2 Original version missed a spot This reverts commit c02977e3bbfaaedcb1b1d67e1692becc7dddd59b. Change-Id: I56244ce10d709fcdef42a001fe4c6ba7b6bbb04d
/frameworks/base/services/core/java/com/android/server/AssetAtlasService.java
|
c02977e3bbfaaedcb1b1d67e1692becc7dddd59b |
|
05-Mar-2015 |
Chad Jones <chadj@google.com> |
Revert "Cleanup Bitmap JNI" This reverts commit b2915245b74b3b5541b123e38403f8e26426b4b7. Change-Id: Idd7d7f33eec4ea5024c83de6b10d3d1a6ab2b17a
/frameworks/base/services/core/java/com/android/server/AssetAtlasService.java
|
b2915245b74b3b5541b123e38403f8e26426b4b7 |
|
04-Mar-2015 |
John Reck <jreck@google.com> |
Cleanup Bitmap JNI Fix a bunch of places where mNativeBitmap was being poked at directly, switch them either to the NDK API or to GraphicsJNI where it made sense Change-Id: I6b3df3712d6497cba828c2d3012e725cb4ebb64d
/frameworks/base/services/core/java/com/android/server/AssetAtlasService.java
|
08c7116ab9cd04ad6dd3c04aa1017237e7f409ac |
|
28-Feb-2015 |
John Spurlock <jspurlock@google.com> |
Remove unused imports in frameworks/base. Change-Id: I031443de83f93eb57a98863001826671b18f3b17
/frameworks/base/services/core/java/com/android/server/AssetAtlasService.java
|
dad7d84c04c5954b63ea8bb58c52b2291f44b4df |
|
09-Dec-2014 |
John Reck <jreck@google.com> |
Teach AssetAtlas about more drawables Bug: 18317479 Change-Id: I16868ee204d24af72af9a2efc987f7e9eb1d266b
/frameworks/base/services/core/java/com/android/server/AssetAtlasService.java
|
17ab38f8a87bc90eab11373f878f220ce3031de6 |
|
27-Jan-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
AArch64: Make AssetAtlasService 64-bit compatible Changes in this patch include [x] Long(64-bit) is used to store native pointers in AssetAtlasService and related classes as they can be 64-bit. [x] Some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> (cherry-picked from 4de3f481bc59ab4b766dc027e41aff7cda9d62f7) Change-Id: If22daf40eef46f8df9f94d65ddcc52c45b3acf2a
/frameworks/base/services/core/java/com/android/server/AssetAtlasService.java
|
36bef0bf30d6bae48cf3837df351075ca4fce654 |
|
20-Jan-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
AArch64: Make graphics classes 64-bit compatible This a merger of two commits submitted to AOSP by the following authors: ashok.bhat@arm.com, david.butcher@arm.coma craig.barber@arm.com, kevin.petit@arm.com and marcus.oakland@arm.com Due to the very large number of internal conflicts, I have chosen to cherry-pick this change instead of letting it merge through AOSP because the merge conflict resolution would be very hard to review. Commit messages below: ================================================ AArch64: Make graphics classes 64-bit compatible Changes in this patch include [x] Long is used to store native pointers as they can be 64-bit. [x] Some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) [x] AssetAtlasManager is not completely 64-bit compatible yet. Specifically mAtlasMap member has to be converted to hold native pointer using long. Added a TODO to AssetAtlasManager.java to indicate the change required. Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> ================================================================== AArch64: Use long for pointers in graphics/Camera For storing pointers, long is used in android/graphics/Camera class, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> =================================================================== Change-Id: Id5793fa0ebc17ee8b1eecf4b3f327977fdccff71
/frameworks/base/services/core/java/com/android/server/AssetAtlasService.java
|
7023df08f14ec5dee76ac54c03e870f84e297636 |
|
27-Jan-2014 |
Narayan Kamath <narayan@google.com> |
Revert "AArch64: Make graphics classes 64-bit compatible" This reverts commit 18b4cbeedef21c1fa666a110a157bab66edff976. Change-Id: I0c52983a3ab1ace3ff743de546a43eca28e5cb0e
/frameworks/base/services/core/java/com/android/server/AssetAtlasService.java
|
18b4cbeedef21c1fa666a110a157bab66edff976 |
|
20-Jan-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
AArch64: Make graphics classes 64-bit compatible This a merger of two commits submitted to AOSP by the following authors: ashok.bhat@arm.com, david.butcher@arm.coma craig.barber@arm.com, kevin.petit@arm.com and marcus.oakland@arm.com Due to the very large number of internal conflicts, I have chosen to cherry-pick this change instead of letting it merge through AOSP because the merge conflict resolution would be very hard to review. Commit messages below: ================================================ AArch64: Make graphics classes 64-bit compatible Changes in this patch include [x] Long is used to store native pointers as they can be 64-bit. [x] Some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) [x] AssetAtlasManager is not completely 64-bit compatible yet. Specifically mAtlasMap member has to be converted to hold native pointer using long. Added a TODO to AssetAtlasManager.java to indicate the change required. Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> ================================================================== AArch64: Use long for pointers in graphics/Camera For storing pointers, long is used in android/graphics/Camera class, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> =================================================================== Change-Id: Ib3eab85ed97ea3e3c227617c20f8d213f17d4ba0
/frameworks/base/services/core/java/com/android/server/AssetAtlasService.java
|
9158825f9c41869689d6b1786d7c7aa8bdd524ce |
|
22-Nov-2013 |
Amith Yamasani <yamasani@google.com> |
Move some system services to separate directories Refactored the directory structure so that services can be optionally excluded. This is step 1. Will be followed by another change that makes it possible to remove services from the build. Change-Id: Ideacedfd34b5e213217ad3ff4ebb21c4a8e73f85
/frameworks/base/services/core/java/com/android/server/AssetAtlasService.java
|