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

4438 Commits

Author SHA1 Message Date
Leon Scroggins III
0e52410217 Merge "Remove dependence on SK_LEGACY_PICTURE_DRAW_API." 2014-12-19 14:31:45 +00:00
John Reck
c21e364386 Merge "Stop pretending USE_OPENGL_RENDERER is a thing" 2014-12-18 22:42:13 +00:00
John Reck
a2732a2bf9 Stop pretending USE_OPENGL_RENDERER is a thing 
Change-Id: I732b490431fe90eafa00a00f3b5429f0d3a067e6
 2014-12-18 14:12:27 -08:00
Elliott Hughes
496894b0e1 am 5cd79d07: Merge "Move the remaining ZygoteInit native code over to Java." automerge: e37f3af 
automerge: e6f2f9d

* commit 'e6f2f9db42632f581d221ece90e1824e114f2f12':
  Move the remaining ZygoteInit native code over to Java.
 2014-12-18 21:00:53 +00:00
Elliott Hughes
e6f2f9db42 am 5cd79d07: Merge "Move the remaining ZygoteInit native code over to Java." 
automerge: e37f3af

* commit 'e37f3af76dc0c876ea7169b9153f79175d0c703d':
  Move the remaining ZygoteInit native code over to Java.
 2014-12-18 20:54:28 +00:00
Mike Reed
f2883b320f explicitly call tryAllocPixels if you want to check for failure 
allows us to remove SK_SUPPORT_LEGACY_ALLOCPIXELS_BOOL

Change-Id: I095a04e358404bc413ceebe81e7e1adfbbbec027
 2014-12-18 16:47:08 +00:00
Elliott Hughes
26b56e628b Move the remaining ZygoteInit native code over to Java. 
Bug: 18719692
Change-Id: I5f9834edecdbcc065a33a9921c740a53441636a4
 2014-12-17 12:28:29 -08:00
Elliott Hughes
dc4b6a892a am 8b3df1f9: am a1beb930: am e6d63b94: Merge "Rewrite selectReadable JNI in Java." 
* commit '8b3df1f971dec922aba4df766ae25dc16c660445':
  Rewrite selectReadable JNI in Java.
 2014-12-17 19:48:49 +00:00
Elliott Hughes
8b3df1f971 am a1beb930: am e6d63b94: Merge "Rewrite selectReadable JNI in Java." 
* commit 'a1beb930f59ae88f4386726cdf3a7e5986bd74e1':
  Rewrite selectReadable JNI in Java.
 2014-12-17 19:42:08 +00:00
Elliott Hughes
894724be30 Rewrite selectReadable JNI in Java. 
Bug: 18719692
Change-Id: Id4fa95a31f112c720f7a3ac47a3b6c95c3028438
 2014-12-16 10:00:33 -08:00
Leon Scroggins III
d40e89258e Remove dependence on SK_LEGACY_PICTURE_DRAW_API. 
Call SkPicture::playback() instead of ::draw().

Also, no need longer need the const_cast.

Change-Id: I4742d2fd5c5b918db492ec2ef6a84ea7d6151cdd
 2014-12-16 16:58:40 +00:00
Elliott Hughes
c4e9215fa5 am 2a6426c9: am e9e1e0d2: Merge "Reimplement reopenStdio in Java." 
automerge: 3e8484c

* commit '3e8484c3f7f615c4b3f1cb925c4164d513cc0e97':
  Reimplement reopenStdio in Java.
 2014-12-15 19:39:58 +00:00
Elliott Hughes
3e8484c3f7 am 2a6426c9: am e9e1e0d2: Merge "Reimplement reopenStdio in Java." 
* commit '2a6426c900d319c7b928242694ad050a73ad324b':
  Reimplement reopenStdio in Java.
 2014-12-15 19:38:04 +00:00
Elliott Hughes
dac83f5e6a Reimplement reopenStdio in Java. 
Bug: 18719692
Change-Id: I4ed984cd6148c5cba75d46a60f32a0687a5bcac3
 2014-12-15 11:00:25 -08:00
Elliott Hughes
7f3a73c7b5 am 20c906a8: am a101befb: Merge "Lose some unnecessary JNI from the zygote." 
automerge: a95b568

* commit 'a95b568f9afcabb067f5ec8ef602800a89d273ee':
  Lose some unnecessary JNI from the zygote.
 2014-12-12 23:38:23 +00:00
Elliott Hughes
a95b568f9a am 20c906a8: am a101befb: Merge "Lose some unnecessary JNI from the zygote." 
* commit '20c906a8d40aed68ee35095f322739664e1e223a':
  Lose some unnecessary JNI from the zygote.
 2014-12-12 23:32:06 +00:00
Elliott Hughes
3fe595108f Lose some unnecessary JNI from the zygote. 
Bug: 18719692
Change-Id: Ie2d50400f10f3c54cfbf94e54656f6d704eac267
 2014-12-12 14:07:34 -08:00
Iliyan Malchev
6f8b9bc9c1 am 16568705: am 45838de9: fix Uss accounting in getPssPid() automerge: 72468d2 
* commit '16568705855f6c8dd78bc188c17e0237c5e827c0':
  fix Uss accounting in getPssPid()
 2014-12-12 04:35:05 +00:00
Iliyan Malchev
1656870585 am 45838de9: fix Uss accounting in getPssPid() 
automerge: 72468d2

* commit '72468d2d146f737b2b5d0223687b8fbc52723c76':
  fix Uss accounting in getPssPid()
 2014-12-12 04:30:52 +00:00
Ruben Brunk
00b2eb2bc0 am c7c20b34: am f6ed526b: Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev automerge: 81b381b 
* commit 'c7c20b34ecbaef5c1f60115755e87dbaaf0cfb4c':
  camera2: Fix LEGACY YUV production and orientation.
 2014-12-12 04:21:07 +00:00
Ruben Brunk
c7c20b34ec am f6ed526b: Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev 
automerge: 81b381b

* commit '81b381b82e83ec742a8a6541dabbc63dae087c0a':
  camera2: Fix LEGACY YUV production and orientation.
 2014-12-12 04:09:55 +00:00
Iliyan Malchev
45838de942 fix Uss accounting in getPssPid() 
Change-Id: I0d1dc81d127afbf3a7d7b4b86865ccb0e8bd7d4c
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2014-12-12 00:20:24 +00:00
Chih-hung Hsieh
17a0826e5d am b0dd6d3a: am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds" 
automerge: d1aa67b

* commit 'd1aa67b8e19ae96bd2ae4e6719d13902a8b6d845':
  Adjust format strings to work on both 32-bit and 64-bit builds
 2014-12-11 21:05:00 +00:00
Chih-hung Hsieh
d1aa67b8e1 am b0dd6d3a: am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds" 
* commit 'b0dd6d3a8a7f11454239facf0ee9b2dd2390945e':
  Adjust format strings to work on both 32-bit and 64-bit builds
 2014-12-11 21:02:08 +00:00
Chih-hung Hsieh
4c23a0ec16 Merge "Adjust format strings to work on both 32-bit and 64-bit builds" 2014-12-11 20:49:30 +00:00
Ruben Brunk
433e715cc0 camera2: Fix LEGACY YUV production and orientation. 
Bug: 18486140
Change-Id: I119e57315b67d1f485bea7f1682bfc261ae0f934
 2014-12-11 11:35:46 -08:00
Eric Laurent
7a27bc3a76 am 09378975: resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aosp 
* commit '093789755e5549bd8676d268a6f69b1d6db5026b':
  AudioSystem JNI: Add audio policy custom mixes registration
 2014-12-10 21:57:35 +00:00
Eric Laurent
093789755e resolved conflicts for merge of 5196dd04 to lmp-mr1-dev-plus-aosp 
Change-Id: I34063a9a516e0d9d209d3176279ef4266b6a113d
 2014-12-10 10:42:08 -08:00
Mike Reed
d64d68d9c1 Merge "drawBitmapMatrix is deprecated, code work-around" 2014-12-10 18:02:12 +00:00
Ruben Brunk
fe6a5ae924 am 28089cc3: Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev automerge: 3ef5033 automerge: 6d98265 
* commit '28089cc39b0247d5e854a1a44cd8af17464b9e36':
  Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.
 2014-12-10 17:44:36 +00:00
Eric Laurent
65bc1125b4 Merge "AudioSystem JNI: Add audio policy custom mixes registration" into lmp-mr1-dev 2014-12-10 01:33:09 +00:00
John Reck
af878b91f9 am 389baa39: am 7d74cb6c: am 14c43689: Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev 
* commit '389baa395125d5ae5aac3b9d2f98457dde09da26':
  Fix issue with RNA destruction mid-animation
 2014-12-09 23:49:22 +00:00
Sebastien Hertz
dde13b3714 am 70acd9b3: resolved conflicts for merge of beb84982 to lmp-mr1-dev-plus-aosp 
* commit '70acd9b36a9fc0d212b25d64f4edf0fc582331cf':
  Work on issue #18640385: Add procstats test mode
 2014-12-09 23:23:36 +00:00
Mathieu Chartier
5311088a3e am e417db6d: am 4ec1bdf5: am 52070f81: Merge "Add more -d dalvik details to dumpsys" into lmp-mr1-dev 
* commit 'e417db6d574e90566e827bb2a1e5efeaa9c6d42e':
  Add more -d dalvik details to dumpsys
 2014-12-09 23:22:38 +00:00
Ruben Brunk
28089cc39b Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev automerge: 3ef5033 
automerge: 6d98265

* commit '6d9826546d89e03cea170ebb5b3f292d5f4a027b':
  Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.
 2014-12-09 23:20:39 +00:00
Ruben Brunk
3ef5033cda Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev 2014-12-09 23:09:52 +00:00
John Reck
389baa3951 am 7d74cb6c: am 14c43689: Merge "Fix issue with RNA destruction mid-animation" into lmp-mr1-dev 
* commit '7d74cb6c6139d42aad65fe1466ab4c5f8e029539':
  Fix issue with RNA destruction mid-animation
 2014-12-09 22:18:27 +00:00
John Reck
c47c98be04 Fix issue with RNA destruction mid-animation 
Bug: 18521508

Fix an issue where an RNA's native object was destroyed
before the java-side object was started

Change-Id: I487fb476e0ecdf7000515f4f7320e8cfbc50a52b
 2014-12-09 12:35:12 -08:00
Ruben Brunk
f4a637d0be Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode. 
Bug: 16030677
Change-Id: Ida04e04f41983b9126609522dd12064a7bf9645f
 2014-12-09 11:56:22 -08:00
Sebastien Hertz
70acd9b36a resolved conflicts for merge of beb84982 to lmp-mr1-dev-plus-aosp 
Change-Id: Ib420549f3e20c149c15966dfece980b4f150177d
 2014-12-09 10:16:46 +01:00
Mathieu Chartier
fb5c932dbb Merge "Add more -d dalvik details to dumpsys" 2014-12-09 02:05:45 +00:00
Dianne Hackborn
8b33cf4d34 Merge "Work on issue #18640385: Add procstats test mode" into lmp-mr1-dev 2014-12-09 01:53:37 +00:00
Dianne Hackborn
1a4b5a4f02 Work on issue #18640385: Add procstats test mode 
You can now do "adb shell dumpsys procstats --start-testing" to
enable high frequency pss sampling.

Also improved the low on RAM mem reporting to separate out RAM
from memtrack, in case the data we are getting from that is bad.

And fixed meminfo --oom to work correctly again.

Change-Id: I7af17eab110a82298bd7b0ce381f8fa5c96c1f6a
 2014-12-08 17:43:31 -08:00
Mathieu Chartier
e417db6d57 am 4ec1bdf5: am 52070f81: Merge "Add more -d dalvik details to dumpsys" into lmp-mr1-dev 
* commit '4ec1bdf52f5c0d48fd13571796644feddc5a815b':
  Add more -d dalvik details to dumpsys
 2014-12-09 01:43:00 +00:00
Mathieu Chartier
063028aa68 Add more -d dalvik details to dumpsys 
Added .NonMoving for the non moving space.
Added .Zygote for the zygote.
Added .IndirectRef for indirect reference tables (jobjects).

Example:
 Dalvik Details
        .Heap     2264     2264        0        0
         .LOS       80       80        0        0
          .GC      144      144        0        0
      .Zygote      331      196        0     2428
   .NonMoving      540      540        0        0
 .IndirectRef       20       20        0        0

Bug: 18672069
Change-Id: Id14e5bc92ceb15fe7a17d9fb035f18aa2925e50c
(cherry picked from commit 25c5e2b12d5d5d06739e3f70a0da968d97935b46)
 2014-12-08 17:33:56 -08:00
Mathieu Chartier
25c5e2b12d Add more -d dalvik details to dumpsys 
Added .NonMoving for the non moving space.
Added .Zygote for the zygote.
Added .IndirectRef for indirect reference tables (jobjects).

Example:
 Dalvik Details
        .Heap     2264     2264        0        0
         .LOS       80       80        0        0
          .GC      144      144        0        0
      .Zygote      331      196        0     2428
   .NonMoving      540      540        0        0
 .IndirectRef       20       20        0        0

Bug: 18672069
Change-Id: Id14e5bc92ceb15fe7a17d9fb035f18aa2925e50c
 2014-12-08 16:38:20 -08:00
Mike Reed
70ffbf9e82 drawBitmapMatrix is deprecated, code work-around 
Change-Id: I53d827ecb74c2b131645eaf3edfd748722c5078d
 2014-12-08 17:03:30 -05:00
Eric Laurent
7f5eb9fe3c AudioSystem JNI: Add audio policy custom mixes registration 
Bug: 16009464.

Change-Id: I3763e79f4fa0331acb56d1d6f575c7a36e0bebd5
 2014-12-08 09:37:30 -08:00
Bernhard Rosenkränzer
46c82b4cd2 Adjust format strings to work on both 32-bit and 64-bit builds 
Adjust format strings to not produce Clang warnings in both 32-bit and
64-bit builds

Change-Id: I76c29d8d5d0fb4b5e9d9518077652370ffe9e871
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
 2014-12-05 16:14:07 -08:00
John Reck
1022888d33 resolved conflicts for merge of 203c8171 to master 
Change-Id: I256397410c261fae049bae4572f132235be1c5c9
 2014-12-04 16:06:34 -08:00