45821 Commits

Author SHA1 Message Date
Eric Hassold
447ee77431 Merge "Detect out of memory in extractAlpha" 2011-02-24 13:47:16 -08:00
Daniel Sandler
551df778f9 Merge "Remove commented cruft, TODOs, and dead code." 2011-02-24 13:36:52 -08:00
Andreas Huber
a2c29973e3 Alternate patch for late video issue: seek only the video ahead to the next
syncframe after the current audio media position, leave audio untouched.

Change-Id: Ia9fa8e205467e5460c8219afd396bddd09fcfb46
related-to-bug: 3375737
2011-02-24 13:32:38 -08:00
Daniel Sandler
56a6d88012 Notification flyover tuning:
- Swipe up on icons or clock to show notifications (3258623)
- Hide notification flyover immediately on tap (3410278)

Bug: 3258623
Bug: 3410278
Change-Id: Ide038e69bb800f744dbb79383246b7b416f06bba
2011-02-24 16:32:26 -05:00
Christopher Tate
7e8a69ed5c Merge "Binder linkage no longer depends on JNI objrefs as persistent tokens" 2011-02-24 13:22:19 -08:00
Christopher Tate
c2d55dd897 Binder linkage no longer depends on JNI objrefs as persistent tokens
There are two areas that have changed to eliminate the assumption that
local jobject references are both canonical and persistent:

1. JavaBBinderHolder no longer holds onto and reuses it parent object
reference per se.  Since the underlying JavaBBinder object holds a
real global ref, this was redundant anyway.  Now, for purposes of its
transient need to perform JNI operations, it simply uses the current
jobject ref(s) passed during method invocation, and no longer attempts
to hold these refs beyond the scope of a single invocation.

2. Binder obituaries no longer assume that a jobject reference to a
recipient will always compare == as a 32-bit value with any future
reference to the same object.  The implementation now asks Dalvik
whether object references match.

Bug 2090115

Change-Id: If62edd554d0a9fbb2d2977b0cbf8ad7cc8e2e68d
2011-02-24 13:15:09 -08:00
Glenn Kasten
373ed6fc79 Merge "Bug 3438258 Add SurfaceTexture as MediaPlayer sink" 2011-02-24 12:37:02 -08:00
Cary Clark
808e8f6837 Merge "center long press to account for sloppy nodes" 2011-02-24 12:19:09 -08:00
Cary Clark
3ecd7db52a center long press to account for sloppy nodes
If a tap is close to, but not on a node, slop allows the tap
to find the node. Pass the slop-corrected values to
requestFocusNodeHref() as well.

bug:3412519
Change-Id: I7543354b6270976e1f99518581de23c567432b98
2011-02-24 14:58:23 -05:00
Eric Fischer
c5f2b9f907 Import revised translations.
Change-Id: Ib0c12e7b10809b2180a743bd2f9c186b04461920
2011-02-24 11:50:41 -08:00
Eric Fischer
261f33c12d am 86409c8c: (-s ours) am 1c38872f: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '86409c8cb789cd7f672ee6de43e6bf1a337847db':
  Import revised translations.  DO NOT MERGE
2011-02-24 11:24:39 -08:00
Leon Scroggins
5bf4bb97e0 Merge "Stop the blinking caret when moving to another field." 2011-02-24 11:21:41 -08:00
Eric Hassold
ef7be262e5 Detect out of memory in extractAlpha
When extractAlpha() native method in Skia fails to allocate pixels,
it resets target bitmap. This change detects when such empty bitmap
is returned, and throws a OutOfMemory Java exception.

Depends on https://android-git.corp.google.com/g/97793

Bug: 3418381
Change-Id: I65a84998be089c49ed5005f6995bdc4f4d1669bc
2011-02-24 11:21:13 -08:00
Eric Fischer
86409c8cb7 am 1c38872f: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '1c38872fd30d7b19a01cc309537e911e7f2344e9':
  Import revised translations.  DO NOT MERGE
2011-02-24 11:18:56 -08:00
Eric Fischer
1c38872fd3 Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-02-24 11:15:53 -08:00
Patrick Dubroy
b5aeb9f4a5 Merge "Fix 3272590: Long-press on home & menu should be same as click" 2011-02-24 10:55:44 -08:00
Wink Saville
df3c4b45c8 am ee38808d: am 0dc8618d: Do not start RILReceiver if wifi-only.
* commit 'ee38808dcca92fa8677e7d03401f6bb7b54ec781':
  Do not start RILReceiver if wifi-only.
2011-02-24 10:52:53 -08:00
Wink Saville
ee38808dcc am 0dc8618d: Do not start RILReceiver if wifi-only.
* commit '0dc8618dc70a6aa23ea030eeda1ea9934b4a04c6':
  Do not start RILReceiver if wifi-only.
2011-02-24 10:50:31 -08:00
Eric Fischer
f951bbf957 Import revised translations. DO NOT MERGE
Change-Id: I6a05c3031a451b0d288762f079203a412133dd14
2011-02-24 10:50:23 -08:00
Jesse Wilson
a0f8bc51af Remove default constructors from static utility classes.
Change-Id: Id8dc55a30a03e1da87500b66c429de9268033b9e
http://b/3344646
2011-02-24 10:46:22 -08:00
repo sync
b5b85a9416 am 3905bc6c: (-s ours) am be2ed6d6: resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp
* commit '3905bc6ca3a2f29d2eb3fc9086ca0078f39c6829':
  DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead.
2011-02-24 10:40:50 -08:00
Shimeng (Simon) Wang
ab85a63317 Merge "Pre-calculate view scale and text wrap scale for webkit." 2011-02-24 10:32:18 -08:00
Gilles Debunne
808b04abe6 Merge "Cursors correctly displayed with legacy theme." 2011-02-24 10:29:44 -08:00
Gilles Debunne
8f58dfad89 Merge "Text handles movement improvements." 2011-02-24 10:29:22 -08:00
Shimeng (Simon) Wang
76064644a7 Pre-calculate view scale and text wrap scale for webkit.
In viewport setup time, pre-calculate the more likely view scale
and text wrap scale instead of waiting until ZoomManager's FirstLayout
time.  This is to give webkit better and more correct information, such
as window width/height and inner width/height, when it is doing first layout.

issue: 3382398
Change-Id: I53fb15da43fbede6c03a4f51ec1c50e9a94f0236
2011-02-24 10:27:07 -08:00
repo sync
3905bc6ca3 am be2ed6d6: resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp
* commit 'be2ed6d6e366d3639aecd7ef615c95f0ccf17b9d':
  DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead.
2011-02-24 10:26:49 -08:00
Leon Scroggins
b611213ea1 Stop the blinking caret when moving to another field.
Bug:2930013

Requires a change in external/webkit.

Change-Id: Ie768efd02da0afe317c0f93e32148ceb5516a1ec
2011-02-24 13:24:00 -05:00
James Dong
d90ce9b411 Merge "Fix MP3Extractor" 2011-02-24 10:11:46 -08:00
James Dong
563ab6ec5e Fix MP3Extractor
When the temp buffer wraps around, the next read position should start
from what have been read to avoid reading the same remaining bytes in
the buffer again.

o also fix some of the formatting string for logging

bug - 3482444

Change-Id: Ie0b56f4691ff9e80a48a57f1b7d0d28c78cfb313
2011-02-24 10:10:32 -08:00
Patrick Dubroy
ece945291e Fix 3272590: Long-press on home & menu should be same as click
Change-Id: I151571900f4bb63910ccfb77fc64c8be9676a224
2011-02-24 10:03:23 -08:00
Glenn Kasten
6152bbc650 Merge "Bug 3362814 Fix SMP race in access to mRequestExit" 2011-02-24 10:01:31 -08:00
repo sync
be2ed6d6e3 resolved conflicts for merge of c96b6690 to gingerbread-plus-aosp
Change-Id: I1d8a026d7efe0762865d6e1a6a3fc79cbbcbd9c4
2011-02-24 09:58:25 -08:00
Alon Albert
c96b669013 Merge "DO NOT MERGE - Increasing timeout to 60 sec This was already done in HC branch in this CL: https://android-git.corp.google.com/w/?p=platform/frameworks/base.git;a=commit;h=d39fd5a97c6f56794a6ed7ac1dfb0bbf585becf1 This is also related to bug http://b/issue?id=3402863 I first considered increasing the timeout specificaly for our GData client but when I saw we already accepted a CL for HC that did this at a lower level, I decided to do that instead." into gingerbread 2011-02-24 09:20:46 -08:00
Glenn Kasten
7b76c8d3fc Merge "Don't crash when parsing DRM MIME types" 2011-02-24 08:17:02 -08:00
Kristian Monsen
256d603d11 Merge "Hiding deprecated classes and methods" 2011-02-24 08:02:34 -08:00
Derek Sollenberger
62c7574c02 Merge "Skia Merge (revision 808)" 2011-02-24 05:27:34 -08:00
Wu-cheng Li
e857cc8175 Merge "Add YV12 preview format to camera parameter constants." 2011-02-24 02:51:17 -08:00
Wu-cheng Li
10a1b30dfb Add YV12 preview format to camera parameter constants.
bug:3463624
Change-Id: I8f2992dadfd3fb9e3c9d67743e52da7f3212827e
2011-02-24 18:19:48 +08:00
Mathias Agopian
ec122eb46b Fix some issues with RefBase debugging.
First slipt sp<> out of RefBase into StrongPointer.h so it can be reused
more easily and to make it clear that it doesn't require RefBase.

Note: the rest of the change only affects the system when DEBUG_REFS is enabled.

The main problem we fix here is that the owner id associated with each
reference could get out of date when a sp<> or wp<> was moved, for
instance when they're used in a Vector< >.

We fix this issue by calling into RefBase::moveReferences from
a template specialization for sp<TYPE> and wp<TYPE> of the
type helpers. RefBase::moveReferences() has then a chance to
update the owner ids.

There is a little bit of trickery to implement this generically in
RefBase, where we need to use a templatized functor that can turn
a sp<TYPE>* casted to a void* into a RefBase*.

Introduced a new debug option DEBUG_REFS_FATAL_SANITY_CHECKS
currently set to 0 by default as there seem to be an issue
with sp<ANativeWindow> which trips the sanity checks.

Change-Id: I4825b21c8ec47d4a0ef35d760760ae0c9cdfbd7f
2011-02-23 22:21:41 -08:00
Romain Guy
47b8adec39 Add a new Camera API to control the camera's location
Change-Id: Id9a082d2def803eb527e1987875e0d8a22c6e8aa
2011-02-23 19:51:42 -08:00
Xavier Ducrohet
031d2f8b6d LayoutLib: Adapt the HC layoutlib to GB. do not merge.
Change-Id: I0b2016987a65fabbc0ce7011514543349e9fb929
2011-02-23 19:47:18 -08:00
Xavier Ducrohet
4b52ec49fe LayoutLib: Original import of Honeycomb's layoutlib. do not merge.
frameworks/base.git @ f0a53435f14d23d9555fc46014352ee6a7baa647

Change-Id: Ibc215751693dc7650683b61bb458f7c8beaf8060
2011-02-23 19:47:02 -08:00
Xavier Ducrohet
81904fa40b Merge "LayoutLib: Add debug mode." 2011-02-23 18:32:15 -08:00
Xavier Ducrohet
8ee31a0a93 Merge "LayoutLib: downsize the SparseArray when possible." 2011-02-23 18:32:10 -08:00
Xavier Ducrohet
f0a53435f1 LayoutLib: Add debug mode.
Change-Id: If4263c7dba63a063f84e0c6988c270eb6d291ac3
2011-02-23 18:12:49 -08:00
Wink Saville
0dc8618dc7 Do not start RILReceiver if wifi-only.
By not starting RILReceiver we don't waste any cycles
trying to communicate with a vendor ril which may
not exist. This allows a wifi-only device to operate
as expected and the system to gracefully handle the
missing radio as ril requests will report RADIO_NOT_AVAILABLE.

Change-Id: I6c6f60830486c5f0447b3b9eb44c8b1f2d70c517
2011-02-23 18:11:45 -08:00
Jason Chen
e4ce73763d am 36b0b85a: (-s ours) am 22577b8d: (-s ours) am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread
* commit '36b0b85abd20b4f4bea210060dec3fbe80870dd5':
  DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
2011-02-23 18:11:21 -08:00
Jason Chen
36b0b85abd am 22577b8d: (-s ours) am 5ff79c3b: Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread
* commit '22577b8d3a39c1373594ba3e4427212eee4cd6d4':
  DO NOT MERGE Cherry-pick of Ie4026a7c back to GB
2011-02-23 18:08:23 -08:00
Gilles Debunne
eca97a320f Cursors correctly displayed with legacy theme.
Bug 3482848

Change-Id: Ic2eda961a8bb5e865bc638106124d00a5a7b4b21
2011-02-23 18:06:48 -08:00
Irfan Sheriff
56ae666995 am 6588c7cf: (-s ours) am 5107eea6: Merge "DO NOT MERGE Add support for background scanning" into honeycomb
* commit '6588c7cf73a9d09cad1fa5d4e558a55a5e5e18df':
  DO NOT MERGE Add support for background scanning
2011-02-23 18:06:02 -08:00