2871 Commits

Author SHA1 Message Date
Elliott Hughes
b1ce729fd0 am 9f13a608: am 2ec939ba: am cf4c7bdd: Merge "Fix whitespace issues after casts."
* commit '9f13a608a703d4d12bbfc65472de766ece0037da':
  Fix whitespace issues after casts.
2013-10-18 12:16:53 -07:00
Elliott Hughes
9f13a608a7 am 2ec939ba: am cf4c7bdd: Merge "Fix whitespace issues after casts."
* commit '2ec939bac6263fefee2605d2b50136955cfcba6d':
  Fix whitespace issues after casts.
2013-10-18 12:11:42 -07:00
Elliott Hughes
f585655b4e am 4a5b3f0a: am ac6e036a: Merge "Remove dependency on jniGetNonMovableArrayElements."
* commit '4a5b3f0ad0b742fbdce154236b15185aaff87ffb':
  Remove dependency on jniGetNonMovableArrayElements.
2013-10-18 12:11:38 -07:00
Mathieu Chartier
6ecb7a9a27 Fix whitespace issues after casts.
Change-Id: Ief3e50fbedd193e22509aac783f16ba1288908de
2013-10-18 11:04:31 -07:00
Mathieu Chartier
7384b428c4 Remove dependency on jniGetNonMovableArrayElements.
jniGetNonMovableArrayElements is not safe and is going to be deleted.

Change-Id: I6daae1e4ac9e01ca593cda522fdbeb774eef1eff
(cherry picked from commit 75a5038849cecf38aba72721272ff07cca09501f)
2013-10-18 10:58:25 -07:00
Mathieu Chartier
75a5038849 Remove dependency on jniGetNonMovableArrayElements.
jniGetNonMovableArrayElements is not compaction safe and is going
to be deleted.

Change-Id: I6daae1e4ac9e01ca593cda522fdbeb774eef1eff
2013-10-18 09:53:45 -07:00
Jeff Sharkey
db289e0ac7 am 47938450: am 306bb90d: am 8f4c15d8: Merge "Plumb through physical device UUID and label." into klp-dev
* commit '47938450b4d19f60edf774c8f451d53aa110ea0b':
  Plumb through physical device UUID and label.
2013-10-17 18:55:13 -07:00
Jeff Sharkey
47938450b4 am 306bb90d: am 8f4c15d8: Merge "Plumb through physical device UUID and label." into klp-dev
* commit '306bb90d97da583c3728d35073ebcb7f7ca5c467':
  Plumb through physical device UUID and label.
2013-10-17 18:53:15 -07:00
Jeff Sharkey
5aca2b8dc4 Plumb through physical device UUID and label.
vold now parse out UUID and label for inserted physical devices,
and reports them to framework.  Add these to hidden StorageVolume
class for use by DocumentsUI and MediaProvider.

Remove last JNI method in FileUtils!

Bug: 11175082
Change-Id: I1cfcd1ade61767b103f693319ea2600008ee2e3c
2013-10-16 16:34:21 -07:00
Nick Kralevich
e5a9908675 am 1f5da180: am f730b759: am d6c2ccb2: Merge "core: fix arithmetic on a pointer to void"
* commit '1f5da180b425c2c568a47b7080345412d0078a13':
  core: fix arithmetic on a pointer to void
2013-10-14 13:19:52 -07:00
Nick Kralevich
1f5da180b4 am f730b759: am d6c2ccb2: Merge "core: fix arithmetic on a pointer to void"
* commit 'f730b7599d18c49e132b73856697b7444cdf091f':
  core: fix arithmetic on a pointer to void
2013-10-14 13:17:20 -07:00
synergydev
01994c79f4 core: fix arithmetic on a pointer to void
Use char* instead of void* for this
pointer arithmetic. Fixes the following:

error: arithmetic on a pointer to void
buf = buf + offset;
      ~~~ ^

Change-Id: I6cfc92c9240fda66a52e780cda7820fdba76914a
2013-10-14 12:27:22 -07:00
Aravind Akella
986481d52a am 554069ee: am d18920f5: am d9b09fa9: Merge "Fix registerListener and flush bugs." into klp-dev
* commit '554069ee8c3a0c06d0849d198325eda9c0128097':
  Fix registerListener and flush bugs.
2013-10-10 19:27:03 -07:00
Aravind Akella
554069ee8c am d18920f5: am d9b09fa9: Merge "Fix registerListener and flush bugs." into klp-dev
* commit 'd18920f5c9c3f4662ceb8f729805ae06761cf108':
  Fix registerListener and flush bugs.
2013-10-10 19:21:08 -07:00
Aravind Akella
d9b09fa97e Merge "Fix registerListener and flush bugs." into klp-dev 2013-10-11 02:05:53 +00:00
Mike Lockwood
32f2e62674 Handle null thread name more gracefully in javaCreateThreadEtc()
Change-Id: I67bebb05736b717e0da60da36839985be08cf1d6
2013-10-10 10:27:14 -07:00
Aravind Akella
4bdc37d315 Fix registerListener and flush bugs.
1) Fix registerListener to return false when called with a Trigger sensor. Correct java documentation.
2) Remove reservedFlags and FlushCompleteListener parameters from the public API.
3) Create SensorEventListener2 which extends SensorEventListener and has the onFlushCompleted callback.
3) Change flush(Sensor) API to flush(SensorEventListener).

Change-Id: I56ce4e0b6e329483e129a14ad7e8a0cd35665ffe
Bug: 10894703
2013-10-09 19:00:22 -07:00
George Mount
7d8589c156 Merge "Support for multiple value animations." 2013-10-09 20:23:43 +00:00
Leon Scroggins III
6034ee95a0 am 25c4e987: am 97b707d5: am 80a058b3: Merge "Do not attempt to decode NULL SkData." into klp-dev
* commit '25c4e98711d29a69db96526e3c72604f7dbb1005':
  Do not attempt to decode  NULL SkData.
2013-10-08 06:41:06 -07:00
Leon Scroggins III
25c4e98711 am 97b707d5: am 80a058b3: Merge "Do not attempt to decode NULL SkData." into klp-dev
* commit '97b707d5eb34d5e76e2b820c158b14fe47631be0':
  Do not attempt to decode  NULL SkData.
2013-10-08 06:38:45 -07:00
Leon Scroggins III
80a058b303 Merge "Do not attempt to decode NULL SkData." into klp-dev 2013-10-08 13:33:05 +00:00
Leon Scroggins III
f65183fd76 Do not attempt to decode NULL SkData.
NewFromFD fails if mmap fails. In that case, it returns a NULL
SkData. SkMemoryStream handles NULL input by calling SkData::NewEmpty,
which is not threadsafe. If the SkMemoryStream were to get some
busted SkData, its call to read might fail. Sidestep this problem
by not creating the SkMemoryStream if the SkData is NULL, skipping
the call to SkData::NewEmpty.

BUG:11028218
Change-Id: Id70299bef1c85ffb5d17102fdb5ea071b0bee68a
2013-10-07 17:30:47 -04:00
George Mount
4eed52944c Support for multiple value animations.
Bug 2805977
Support for multi-value setters in ObjectAnimator.

Change-Id: I7854dfcb82372afc6d9afb4c50a289ff9d41574e
2013-10-07 13:22:39 -07:00
Victoria Lease
28ff40405d am e8200873: am 0d5a719d: am b088c9e0: Merge "reset mShapingPaint\'s SkTypeface before we use it" into klp-dev
* commit 'e8200873598cf872062126b86edd933620f594aa':
  reset mShapingPaint's SkTypeface before we use it
2013-10-04 18:04:57 -07:00
Victoria Lease
e820087359 am 0d5a719d: am b088c9e0: Merge "reset mShapingPaint\'s SkTypeface before we use it" into klp-dev
* commit '0d5a719dc7f2ca8726f670af3c5b9fdee614ab07':
  reset mShapingPaint's SkTypeface before we use it
2013-10-04 18:01:45 -07:00
Victoria Lease
b088c9e0dd Merge "reset mShapingPaint's SkTypeface before we use it" into klp-dev 2013-10-05 00:55:52 +00:00
Victoria Lease
8450a6ef8b reset mShapingPaint's SkTypeface before we use it
Harfbuzz works in TTF glyph-space, but most of Skia works in
fallback glyph-space. shapeFontRun() helpfully calculates the
baseGlyphCount needed to convert between the two, but leaves
mShapingPaint's SkTypeface set to the specific TTF being shaped
rather than the original SkTypeface that was requested. Needless
to say, this causes all manner of horrific malady when glyph
indices are calculated in one glyph-index-space and then applied
to another.

To fix this issue, I reset mShapingPaint's SkTypeface when done
with the Harfbuzz shaping operation so that the baseGlyphCount only
gets applied once.

Change-Id: Ia886f89d667634e15e5fc8d7af443c9d1ba89622
2013-10-04 17:33:35 -07:00
Dianne Hackborn
6588538ec5 am 7c55154d: am 80e75d39: am 0d763a90: Merge "Implement issue #11050739: Show swapped out RAM" into klp-dev
* commit '7c55154d4776896c3e602f4739fd5b9cbbf1dba4':
  Implement issue #11050739: Show swapped out RAM
2013-10-04 09:11:17 -07:00
Dianne Hackborn
7c55154d47 am 80e75d39: am 0d763a90: Merge "Implement issue #11050739: Show swapped out RAM" into klp-dev
* commit '80e75d3946fd4c5cdd913d217df1b8d32ec464ee':
  Implement issue #11050739: Show swapped out RAM
2013-10-03 15:39:36 -07:00
Dianne Hackborn
8883ced18a Implement issue #11050739: Show swapped out RAM
Add "swapped out" field to mem info everywhere.

Change-Id: I89abe8eb0e91fa5c193da93815dc592593c8a3c8
2013-10-02 17:40:05 -07:00
Dianne Hackborn
81f87faede am 57d96f0e: Merge "Fix issue #10948509: Crash in procstats when there is no data" into klp-dev
* commit '57d96f0e92e8af842878660a8271e65cec2426d3':
  Fix issue #10948509: Crash in procstats when there is no data
2013-10-01 18:45:11 -07:00
Dianne Hackborn
e2a67ac27b am 57d96f0e: Merge "Fix issue #10948509: Crash in procstats when there is no data" into klp-dev
* commit '57d96f0e92e8af842878660a8271e65cec2426d3':
  Fix issue #10948509: Crash in procstats when there is no data
2013-09-30 17:10:55 -07:00
Dianne Hackborn
cb4285537b Fix issue #10948509: Crash in procstats when there is no data
Not dealing with the case where there is a null list.

Also fixed some bugs I found while looking at this:

- When resetting the stats, we would use a newly computed time stamp
  for the total durations rather than the one we used to reset the
  proc/service entries.  This would result in them being able to be
  slightly > 100%.
- There was a bug in how we split a single process state into its
  per-package representation, where we would but the cloned process
  state into the new package's entry (instead of properly for its
  own package entry), to be immediately overwritten by the new
  process state we make for that package.  This could result in
  bad data for processes that have multiple packages.
- There was a bug in resetting service stats, where we wouldn't
  update the overall run timestamp, allowing that time to sometimes
  be > 100%.
- There was a bug in computing pss data for processes with multiple
  packages, where the pss data was not distributed across all of the
  activity per-package process states.
- There was a bug in computing the zram information that would cause
  it to compute the wrong value, and then never be displayed.

Finally a little code refactoring so that ProcessState and ServiceState
can now share a common implementation for the table of duration values.

Change-Id: I5e0f4e9107829b81f395dad9419c33257b4f8902
2013-09-29 17:14:15 -07:00
Elliott Hughes
cfd9a2c1db am 917f88f0: am 82e5d875: am ebd397ad: Merge "Regenerate all the OpenGL stubs."
* commit '917f88f033aafb89cbb77feda2932cf88698a56a':
  Regenerate all the OpenGL stubs.
2013-09-27 15:44:14 -07:00
Elliott Hughes
917f88f033 am 82e5d875: am ebd397ad: Merge "Regenerate all the OpenGL stubs."
* commit '82e5d8758a61f1a49700f67f6ddb69219528bad2':
  Regenerate all the OpenGL stubs.
2013-09-27 15:41:25 -07:00
Adam Lesinski
9c437bcb57 am 7979e170: am bde988ad: Merge "Add Graphics alloc tracking via memtrack" into klp-dev
* commit '7979e170b5bdfb6922d758f2c66f06829b6b5d9b':
  Add Graphics alloc tracking via memtrack
2013-09-26 10:31:27 -07:00
Adam Lesinski
7979e170b5 am bde988ad: Merge "Add Graphics alloc tracking via memtrack" into klp-dev
* commit 'bde988ade5f75c3d241422dce2ee4124871fab53':
  Add Graphics alloc tracking via memtrack
2013-09-26 10:27:55 -07:00
Adam Lesinski
bde988ade5 Merge "Add Graphics alloc tracking via memtrack" into klp-dev 2013-09-26 17:22:31 +00:00
Dianne Hackborn
f3647c7bdc am f9ad7b9d: am 66a9b2d7: Merge "Fix issue #10903002: com.facebook.katana keeps itself in A Services" into klp-dev
* commit 'f9ad7b9d92f0464bdffb36f4b9f9f63292ba9863':
  Fix issue #10903002: com.facebook.katana keeps itself in A Services
2013-09-25 16:50:14 -07:00
Dianne Hackborn
f9ad7b9d92 am 66a9b2d7: Merge "Fix issue #10903002: com.facebook.katana keeps itself in A Services" into klp-dev
* commit '66a9b2d7392a7f6334b5fe23d00ba718f3fa1851':
  Fix issue #10903002: com.facebook.katana keeps itself in A Services
2013-09-25 16:09:13 -07:00
Dianne Hackborn
cbd9a52f25 Fix issue #10903002: com.facebook.katana keeps itself in A Services
Now when memory low, if a service's process is above
a selected pss, then the process is not allowed to go
in to the service a list.

Also simplified the normal meminfo details dump to not
include the shared dirty and shared clean sizes by
default, since these can be very confusing.  You will
still get to see them with the "-a" flag.

Finally some small steps to better managing service
processes in the LRU list, so hopefully we can some
day be better about letting them drop down in the list
when there isn't really much interesting happening in
the process.  Not yet used at this point.

Change-Id: I654bfd6d05de2a63120185ebb15ffda8cbeb5dac
2013-09-25 15:45:56 -07:00
Adam Lesinski
5b4ef81f2b Add Graphics alloc tracking via memtrack
Any OpenGL memory reported by /proc/pid/smaps will not be included
in the GPU GL memory count and will be considered Unknown. This is
an artifact of how some memory reporting is done in libmemtrack
and some is done in this module.

bug:10294768

Change-Id: Id8fb63b2e86520f4dbc8410573a509e66b96b13b
2013-09-25 14:41:49 -07:00
Elliott Hughes
428d3fcbe3 Regenerate all the OpenGL stubs.
Bug: https://code.google.com/p/android/issues/detail?id=60390
Change-Id: I2e6f210178f656a5f08a1fcd4239581d680329a6
2013-09-24 17:15:41 -07:00
Derek Sollenberger
5380709c78 am fad41c8f: am 5db1f5aa: Merge "Fix Java API error where requesting another style for a provided family fails" into klp-dev
* commit 'fad41c8fd1024a8257bdced18dbcbc9cd67e407a':
  Fix Java API error where requesting another style for a provided family fails
2013-09-24 10:22:29 -07:00
Derek Sollenberger
fad41c8fd1 am 5db1f5aa: Merge "Fix Java API error where requesting another style for a provided family fails" into klp-dev
* commit '5db1f5aaacf01e176f2463c212da72eaafc79165':
  Fix Java API error where requesting another style for a provided family fails
2013-09-23 18:59:24 -07:00
Derek Sollenberger
fe8e21fd80 Fix Java API error where requesting another style for a provided family fails
Internally the API uses the same code path as SkTypeface::CreateFromName which
returns NULL if the requested style is not supported by the existing family.
However, the existing Java API expects that we return the default font in the
requested style so this CL ensures that we do.

bug: 10860066
Change-Id: Ide3a0cc24015e97fa35aef283b42e7d7d11edd9c
2013-09-23 09:22:56 -04:00
Glenn Kasten
f045a893ca am dd47d78a: am 543de874: Merge "Revert "Workaround for slow AudioRecord destructor"" into klp-dev
* commit 'dd47d78a5e2b8d6f383e79fd4531fd38403d5614':
  Revert "Workaround for slow AudioRecord destructor"
2013-09-20 15:44:21 -07:00
Glenn Kasten
dd47d78a5e am 543de874: Merge "Revert "Workaround for slow AudioRecord destructor"" into klp-dev
* commit '543de8746e1c238f81a863f687d258ad86f5ef95':
  Revert "Workaround for slow AudioRecord destructor"
2013-09-20 15:41:00 -07:00
Glenn Kasten
543de8746e Merge "Revert "Workaround for slow AudioRecord destructor"" into klp-dev 2013-09-20 22:38:19 +00:00
Svetoslav
6e1e8b17c5 am c0e1ae01: am facc08c7: Merge "Move PdfDocument to android.graphics.pdf" into klp-dev
* commit 'c0e1ae0176b2ce23ea1b19883507cd920712289a':
  Move PdfDocument to android.graphics.pdf
2013-09-20 11:21:05 -07:00