2890 Commits

Author SHA1 Message Date
Victoria Lease
d0d4b00ac5 am dd3776d6: am 30a3ef6c: am c89eaf91: Merge "Fix for Typeface.create(Typeface, style) semantics changed in KK" into klp-dev
* commit 'dd3776d673776785f32aa7d813871a38de906c5d':
  Fix for Typeface.create(Typeface, style) semantics changed in KK
2013-11-06 11:39:58 -08:00
Victoria Lease
dd3776d673 am 30a3ef6c: am c89eaf91: Merge "Fix for Typeface.create(Typeface, style) semantics changed in KK" into klp-dev
* commit '30a3ef6c85011ba82a777e6eef7f026323019f35':
  Fix for Typeface.create(Typeface, style) semantics changed in KK
2013-11-06 11:37:15 -08:00
Victoria Lease
c89eaf916a Merge "Fix for Typeface.create(Typeface, style) semantics changed in KK" into klp-dev 2013-11-06 19:30:23 +00:00
Raph Levien
4f0064fa34 Fix for Typeface.create(Typeface, style) semantics changed in KK
This is a fix for bug 11553661. The "closest match" heuristic for
resolving a typeface when an exact match was not found changed between
JB MR2 and KK, resulting in loss of custom typeface when StyleSpan was
applied. This patch reinstates the logic that had been present. Also
reported externally as:
https://code.google.com/p/android/issues/detail?id=61771

Change-Id: Ia432fca07c4bf3b830ee2487cd8f5267a9cfb7ff
2013-11-06 11:16:01 -08:00
Elliott Hughes
dd86ed9b57 resolved conflicts for merge of ed84dea9 to master
Change-Id: Id214389f321f07aadd7a25e454a07863d7b128cb
2013-10-29 14:58:16 -07:00
Elliott Hughes
ed84dea928 am 8f592378: am 69920427: Merge "Fix a variety of small publicly-reported bugs."
* commit '8f592378a1ea7f31d57253dc202f42707ef4da36':
  Fix a variety of small publicly-reported bugs.
2013-10-29 13:35:04 -07:00
Michael Wright
0160bcbe53 am 0116f08b: am 961cc671: am 3f836741: Merge "Speculatively schedule input consumption" into klp-dev
* commit '0116f08b387d237c334b10bb0266426e1ab3c793':
  Speculatively schedule input consumption
2013-10-29 13:29:34 -07:00
Michael Wright
0116f08b38 am 961cc671: am 3f836741: Merge "Speculatively schedule input consumption" into klp-dev
* commit '961cc6717a59eaff449acf1ddd3d3857d8c47430':
  Speculatively schedule input consumption
2013-10-29 13:26:06 -07:00
Michael Wright
3f83674150 Merge "Speculatively schedule input consumption" into klp-dev 2013-10-29 20:20:45 +00:00
Elliott Hughes
c367d48c55 Fix a variety of small publicly-reported bugs.
Possible NULL dereference in cmds/bootanimation/BootAnimation.cpp.
https://code.google.com/p/android/issues/detail?id=61556

Missing fclose in core/jni/android_os_Debug.cpp.
https://code.google.com/p/android/issues/detail?id=61546

Bad loop guards in core/jni/android_util_Process.cpp.
https://code.google.com/p/android/issues/detail?id=61557

Assignment to wrong variable in libs/androidfw/AssetManager.cpp.
https://code.google.com/p/android/issues/detail?id=61560

Missing delete[]s in libs/androidfw/ObbFile.cpp.
https://code.google.com/p/android/issues/detail?id=61549

Leaks on error in tools/aapt/Images.cpp.
https://code.google.com/p/android/issues/detail?id=61552

Two missing fclose calls in tools/aapt/Resource.cpp.
https://code.google.com/p/android/issues/detail?id=61553

Missing fclose in tools/aidl/aidl.cpp.
https://code.google.com/p/android/issues/detail?id=61554

Change-Id: I5820f3824e72d07a9acb776cf0af3e7443f5694a
2013-10-29 13:12:55 -07:00
Michael Wright
62ce65d6ed Speculatively schedule input consumption
With the new tuned vsync offset, vsyncs are likely to occur shortly
after the input is received, meaning we will empty the input queue,
and thus won't schedule input consumption until more input is
received. If an application then speculatively posts draw commands to
the main looper faster than 60 hz, it will eventually end up blocking
in eglSwapBuffers. Since we're blocking in eglSwapBuffers, we won't
even schedule consumption until after the current frame (8-16ms), and
it's entirely likely we won't actually get around to consuming input
until after the next frame (another 16 ms of latency). This means we
can often go 16-32ms without processing any input events, causing
very noticeable amounts of jank.

Rather than waiting for the next input event to schedule input
consumption, speculatively schedule it every frame as long as we've
consumed some motion batch during this frame.

Bug: 11398045
Change-Id: I25e46308e00e9f9de00a1d8906f6b0e0f2e845b4
2013-10-26 12:18:00 -07:00
Igor Murashkin
560ce7738c am ee46eab2: am ba111ef9: am c802a661: Merge "Trace: add ALOGVs for easier debugging" into klp-dev
* commit 'ee46eab2d026c9d22d6243cc945c150c877edc16':
  Trace: add ALOGVs for easier debugging
2013-10-25 16:14:10 -07:00
Igor Murashkin
ee46eab2d0 am ba111ef9: am c802a661: Merge "Trace: add ALOGVs for easier debugging" into klp-dev
* commit 'ba111ef9b5ed90d6b5021086548fcc9c35953ecf':
  Trace: add ALOGVs for easier debugging
2013-10-25 15:17:31 -07:00
Igor Murashkin
c802a66140 Merge "Trace: add ALOGVs for easier debugging" into klp-dev 2013-10-25 22:11:07 +00:00
Victoria Lease
ec1ae35c3e am ed82a648: am 54b7e3e8: am a80d6424: Merge "Implement language-specific GSUB processing" into klp-dev
* commit 'ed82a6482806b44fa816b8224d8c06fbffcd5bd3':
  Implement language-specific GSUB processing
2013-10-21 09:03:28 -07:00
Victoria Lease
ed82a64828 am 54b7e3e8: am a80d6424: Merge "Implement language-specific GSUB processing" into klp-dev
* commit '54b7e3e81c39a5e94fd3dcd67cc4eba0f56351f2':
  Implement language-specific GSUB processing
2013-10-21 09:01:18 -07:00
Victoria Lease
a80d642498 Merge "Implement language-specific GSUB processing" into klp-dev 2013-10-21 15:55:30 +00:00
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
Igor Murashkin
c7282eb841 Trace: add ALOGVs for easier debugging
Bug: 11071158
Change-Id: I08764db1742267dad88fd61f22c21df9b70f879e
2013-10-17 18:19:48 -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
Raph Levien
677726b376 Implement language-specific GSUB processing
This patch allows HarfBuzz to select language-specific features based
on the language. It is a fix for bug 7004056.

Change-Id: I63f01b9580250728b900f19f357cefdeb9d36c72
2013-10-08 15:47:42 +02: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