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

4358 Commits

Author SHA1 Message Date
Leon Scroggins III
8c9ae41bc7 am 303581be: resolved conflicts for merge of 3ff978a5 to cw-d-mr1-dev 
* commit '303581be5ba3875b0501cb8aa00a0228e22a6cc6':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-12 16:29:07 +00:00
Leon Scroggins III
303581be5b resolved conflicts for merge of 3ff978a5 to cw-d-mr1-dev 
Change-Id: I37a4be53f44035c1ff58ba6c4da3a14803b946c2
 2015-06-10 14:56:11 -04:00
Leon Scroggins III
3ff978a520 am 77dde3cb: am 6b16398d: am 604ae32b: am 4dae8e41: Merge "DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes" into lmp-dev 
* commit '77dde3cbd049e75ea7447d3413bf52dbfe8c6342':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-10 16:21:26 +00:00
Leon Scroggins III
6b16398dd1 am 604ae32b: am 4dae8e41: Merge "DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes" into lmp-dev 
* commit '604ae32bcc6791da813a8e594783b695131bf888':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-10 15:51:38 +00:00
Leon Scroggins III
604ae32bcc am 4dae8e41: Merge "DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes" into lmp-dev 
* commit '4dae8e41b530672030731ec7cb69369da645cf30':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-02 13:01:13 +00:00
Leon Scroggins III
6549eed89e DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes 
bug: 20883006
Change-Id: I4f109667fb210a80fbddddf5f1bfb7ef3a02b6ce
 2015-05-29 20:14:58 +00:00
Leon Scroggins III
557ee34d97 am 2adefefa: am b6e3f930: am 2bbcc253: am b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev 
* commit '2adefefa3576142767c45b84d97e05078ead3539':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE
 2015-05-27 17:52:51 +00:00
Leon Scroggins III
b6e3f930c1 am 2bbcc253: am b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev 
* commit '2bbcc253254a497b8f9bb86712fb6f0f2548e9f2':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE
 2015-05-27 17:18:47 +00:00
Leon Scroggins III
2bbcc25325 am b36ace74: Merge "Check that the parcel contained the expected amount of region data. DO NOT MERGE" into lmp-dev 
* commit 'b36ace7401c0e198ceddd2fdb908346b7bb5928f':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE
 2015-05-27 14:39:21 +00:00
Leon Scroggins III
5cfd16201f Check that the parcel contained the expected amount of region data. DO NOT MERGE 
bug:20883006
Change-Id: Ib47a8ec8696dbc37e958b8dbceb43fcbabf6605b
 2015-05-26 21:09:24 +00:00
John Reck
570b2052bb DO NOT MERGE resolved conflicts for merge of 951f2347 to lmp-mr1-ub-dev 
Change-Id: Ic392bf6f2cf9e9bf526b6ea63a3be7e50420e7d1
 2015-05-14 07:38:11 -07:00
John Reck
951f23478d am d955dceb: am 862540cd: Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp-mr1-dev 
* commit 'd955dceb4f38f214e62024e808b2b1a21be41940':
  Revert "DO NOT MERGE Backport of limited jank-tracking metrics"
 2015-05-14 01:05:47 +00:00
John Reck
862540cdb1 Merge "Revert "DO NOT MERGE Backport of limited jank-tracking metrics"" into lmp-mr1-dev 2015-05-14 00:40:45 +00:00
John Reck
7238435e9b resolved conflicts for merge of e869835d to lmp-mr1-ub-dev 
Change-Id: Ia183cafb1aa19dcbb6e3bbefceecec5df29663da
 2015-05-13 17:16:31 -07:00
John Reck
e869835d6a am a5b28b92: am 69355eaa: Merge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-dev 
* commit 'a5b28b92b14d0949d43be6198fedc31872ad07f6':
  DO NOT MERGE Backport of limited jank-tracking metrics
 2015-05-13 22:07:15 +00:00
John Reck
25607a6642 Revert "DO NOT MERGE Backport of limited jank-tracking metrics" 
This reverts commit 2614bd225f84f7a23e6b30fc6b47bede153e5f4c.

Change-Id: I344b4cbaa0bb0caf50bceb806d1446ee27ea52d8
 2015-05-13 21:42:28 +00:00
John Reck
69355eaa1c Merge "DO NOT MERGE Backport of limited jank-tracking metrics" into lmp-mr1-dev 2015-05-13 21:42:13 +00:00
Leon Scroggins III
60d7c9fcbc am 6db29a92: am f828f43f: am 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '6db29a92452c2a837528d20d024dcacefd450c17':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-24 17:54:50 +00:00
Leon Scroggins III
6db29a9245 am f828f43f: am 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit 'f828f43f97f4a018e2224e926b900713081a8c5b':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-24 17:43:23 +00:00
Leon Scroggins III
38cf068c04 am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '16ac8ad7fac73524b5296f955884bd2aec405ded':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-24 17:15:43 +00:00
Leon Scroggins III
16ac8ad7fa am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit '4a6ca6724c789603626d74a8cc187365788a6cfd':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-23 15:53:24 +00:00
Leon Scroggins III
4a6ca6724c Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
When reading from the parcel, if the number of colors is invalid, early
exit.

Add two more checks: setInfo must return true, and Parcel::readInplace
must return non-NULL. The former ensures that the previously read values
(width, height, etc) were valid, and the latter checks that the Parcel
had enough data even if the number of colors was reasonable.

Also use an auto-deleter to handle deletion of the SkBitmap.

Cherry pick from change-Id: Icbd562d6d1f131a723724883fd31822d337cf5a6

BUG=19666945

Change-Id: Iab0d218c41ae0c39606e333e44cda078eef32291
 2015-04-16 15:38:03 +00:00
Dmitriy Ivanov
d95e58cb60 Merge "Load libraries directly from apk" 2015-04-07 17:28:15 +00:00
Dmitriy Ivanov
dec4688f40 Load libraries directly from apk 
Introduced new 'extractNativeLibs' attribute to manifest/application.
 Setting it to false prevents installer from extracting library from apk.

 The default value for extractNativeLibs is true.

Bug: 8076853
(cherry picked from commit ff193d642eea7128faad837d19e347cd25212c27)
Change-Id: I1aa2c039bb2a590ae72f256acc9ba5401c2c59b1
 2015-04-07 17:25:23 +00:00
Andreas Gampe
605cca1a98 Frameworks/base: Pass variant and feature-set to runtime 
This is required so we pick up the settings correctly when compiling
the boot image on device, or compile any dex files through a
DexClassLoader.

Bug: 20055104
Change-Id: Ia3ab2e48855060894b36f7fd360fe17b978e45a6
 2015-04-03 16:08:20 -07:00
Andreas Gampe
e324ba0e7c Frameworks/base: Use system property for cache prune counter 
Expose ART's -Xzygote-max-boot-retry through a new system property
dalvik.vm.zygote.max-boot-retry.

Bug: 19983101
Change-Id: Ib88f807e0082d71292c14c7af38e02cca5a5602c
 2015-04-01 19:50:58 +00:00
Andreas Gampe
74ad30f969 Frameworks/base: Support dex2oat threads system property 
Check dalvik.vm.dex2oat-threads in AndroidRuntime and pass to ART
with "-j" as a compiler option, if found.

Check dalvik.vm.image-dex2oat-threads in AndroidRuntime and pass to
ART with "-j" as an image compiler option, if found.

Bug: 19992386

(cherry picked from commit e0352388238875ef7e7b31d914fc903b08ff0f6b)

Change-Id: I5e7806cf560607d31a1d6901dffb14bee538c9cc
 2015-03-30 21:05:12 -07:00
Andreas Gampe
e035238823 Frameworks/base: Support dex2oat threads system property 
Check dalvik.vm.dex2oat-threads in AndroidRuntime and pass to ART
with "-j" as a compiler option, if found.

Check dalvik.vm.image-dex2oat-threads in AndroidRuntime and pass to
ART with "-j" as an image compiler option, if found.

Bug: 19992386
Change-Id: I5e7806cf560607d31a1d6901dffb14bee538c9cc
 2015-03-30 20:16:03 -07:00
Mathieu Chartier
1fb7aab9b2 Revert "Change jit properties to be debug properties" 
Bug: 19735273

This reverts commit 1ad10ef1e4b83ef9e845761a82e202bb57e2379d.

Change-Id: Iac930925ab6d5cd5947fa4077c8d93e2984927d5
 2015-03-18 19:07:02 -07:00
John Reck
2614bd225f DO NOT MERGE Backport of limited jank-tracking metrics 
Bug: 19821830

Cherry-pick of ba6adf66d3c44c0aa2fd8a224862ff1901d64300
Cherry-pick of e70c5754d01f2ab0ff47ea3eabaa88aca5ed2a36

Change-Id: Id342fa0ab345f204bec58acf45ce72f6de950cfb
 2015-03-18 14:22:01 -07:00
Mathieu Chartier
008ec61e0c Merge "Change jit properties to be debug properties" 2015-03-17 02:04:34 +00:00
Mathieu Chartier
1ad10ef1e4 Change jit properties to be debug properties 
Bug: 19735273
Change-Id: I266cf447a7af0595366bf89109d2823094f5cf41
 2015-03-16 16:22:52 -07:00
Stephen Smalley
16d1cce8ff Drop unusable SELinux APIs. 
setSELinuxEnforce is not allowed by policy.
get/setBooleanValue and getBooleanNames are moot since SELinux
policy booleans are forbidden by CTS.

Change-Id: I512953edd1c38828efce698ae8475603775c32e8
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2015-03-13 14:09:26 -04:00
Elliott Hughes
6291beddfc am 63d43949: Merge "Use the icu:: namespace for icu4c API." 
* commit '63d43949047eaed1cddf10bb4f666df6807618ce':
  Use the icu:: namespace for icu4c API.
 2015-03-09 18:20:42 +00:00
Elliott Hughes
4c5806b6b4 Use the icu:: namespace for icu4c API. 
The icu guys recommend working this way, though it's not the default.
Internally Google makes this the default, and I've switched libcore
over.

Bug: 15350832
Change-Id: I038e12bea58dd089a46d0e681b5ab76cfc19d7b9
 2015-03-07 11:00:50 -08:00
Mathieu Chartier
773bcfa7ec am e59b7ce2: Merge "Add JIT system properties" 
* commit 'e59b7ce2564a916240e561b36f4476f2d72a65c5':
  Add JIT system properties
 2015-03-06 01:36:55 +00:00
Mathieu Chartier
6909c0e1e7 Add JIT system properties 
Added the following runtime options.
"dalvik.vm.usejit" -> "-Xusejit:"
"dalvik.vm.jitcodecachesize" -> "-Xjitcodecachesize:"
"dalvik.vm.jitthreshold" -> "-Xjitthreshold:"

Bug: 17950037
Change-Id: I4996cdd1e34a1743d83c37069f545e6e09bccdb9
 2015-03-05 17:02:54 -08:00
Mark Salyzyn
012c3b723a am a891d08d: Merge "jni: Add paranoia regarding android_logger_list_read" 
* commit 'a891d08dad829c9aacd29bd2c3b36debe3fc1cc3':
  jni: Add paranoia regarding android_logger_list_read
 2015-02-27 18:52:36 +00:00
Mark Salyzyn
ca50cd2114 jni: Add paranoia regarding android_logger_list_read 
Change-Id: Ic52be201ec7efaef6a385aaf8ea523554aa06f22
 2015-02-26 14:49:17 -08:00
Dan Albert
b7121d7030 am b78cce6f: Merge "Update autogenerated gl functions." 
* commit 'b78cce6f92e38b57a6a56183cdbafc054c5758fe':
  Update autogenerated gl functions.
 2015-02-25 23:00:52 +00:00
Dan Albert
b78cce6f92 Merge "Update autogenerated gl functions." 2015-02-25 22:50:25 +00:00
Mark Salyzyn
533758c1fb am 0d8b97a4: Merge "jni: switch to ANDROID_LOG_* mode flags" 
* commit '0d8b97a44e4cb5c5cfffd6421eb2cec1ebc00d2f':
  jni: switch to ANDROID_LOG_* mode flags
 2015-02-25 19:13:12 +00:00
Mark Salyzyn
18998c9852 jni: switch to ANDROID_LOG_* mode flags 
Change-Id: I8aea5bf4faf79a96fa8485f7707e7484cd11d7a3
 2015-02-25 18:07:21 +00:00
Dan Albert
10caf0390d Update autogenerated gl functions. 
Corresponding frameworks/native change:
https://android-review.googlesource.com/#/c/134491/

Since this fixes the int-to-pointer cast issues, stop ignoring that
warning.

Change-Id: I85134dc151ba368e4619e36125264b2b3f104202
 2015-02-23 10:47:19 -08:00
Natalie Silvanovich
bb4d0676fd am 494d5b77: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-dev 
* commit '494d5b7757fab576facc5a7e923d2a15650dea1c':
  Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
 2015-02-19 00:05:53 +00:00
Eino-Ville Talvala
ad5591f819 am f5d30463: am 4fa3a80b: am a5f301c7: Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev 
* commit 'f5d304636d27ea300c092fac0f0214170a89ba39':
  Legacy: Only set user surface dimensions on output surfaces
 2015-02-12 05:54:34 +00:00
Eino-Ville Talvala
b0acf7fcfa Legacy: Only set user surface dimensions on output surfaces 
The GL layer gets exclusive use of the direct producer dimensions;
we should only set the user dimensions.

Bug: 16404608
Change-Id: Ie5b720104bdbee6b096b62520baa1c6b518c6c1c
 2015-02-11 16:58:10 -08:00
Leon Scroggins III
b296e4e0c2 Check that bitmap's size does not exceed 32 bits. DO NOT MERGE 
BUG:19270126
Change-Id: I075d1cefcd3208305a72b4fa629a262e92eb60ea
(cherry picked from commit 89a2466a2a2859df5f29350117efd7f9d6a2e32f)
 2015-02-10 22:23:53 +00:00
Leon Scroggins III
89a2466a2a Check that bitmap's size does not exceed 32 bits. DO NOT MERGE 
BUG:19270126
Change-Id: I075d1cefcd3208305a72b4fa629a262e92eb60ea
 2015-02-10 20:57:45 +00:00
Leon Scroggins III
714b6517dc am cae216f8: am 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. 
* commit 'cae216f8dc3e1d752f2c353e488da07cadd95570':
  Handle bad ninepatch data.
 2015-01-27 23:02:57 +00:00