73557 Commits

Author SHA1 Message Date
Dianne Hackborn
eba00ce996 Merge "Okay now let's really turn it off." 2012-03-26 11:12:28 -07:00
Dianne Hackborn
69dc66e91b Okay now let's really turn it off.
Change-Id: Idda3c13339a6a29a300555d31e67219c9af4ae68
2012-03-26 10:50:54 -07:00
Dianne Hackborn
a026b48972 Merge "Turn off "too slow" logs." 2012-03-26 10:40:50 -07:00
Dianne Hackborn
551d0b1f2a Turn off "too slow" logs.
Change-Id: I6ec306ca1c55226269c4644a869a984c4fa00f0d
2012-03-26 10:25:59 -07:00
Jesse Wilson
e300d82828 Merge "Add an API to expose Next Protocol Negotiation (NPN)." 2012-03-26 10:14:44 -07:00
Victoria Lease
6af84f678d Merge "move FindListener into WebView" 2012-03-26 09:13:08 -07:00
Nick Kralevich
c610a6bac7 Merge "resist umask changes, make dirs 0711" 2012-03-26 09:03:07 -07:00
Victoria Lease
d405a433e6 move FindListener into WebView
Also took advantage of the opportunity to adjust the javadoc.

Bug: 6052412
Change-Id: I3de2cc6f2b5af20acb87d6e0a105ac12b1be679b
2012-03-26 08:49:49 -07:00
Marco Nelissen
7061b5ffb3 Merge "Speed up playlist processing" 2012-03-26 07:36:41 -07:00
Glenn Kasten
4acee00352 Add TRACK_FAST for IAudioFlinger::createTrack
Currently not implemented by client or server

Change-Id: Ib11dda57db3eeb871bcc7b546e340078776875f5
2012-03-26 07:25:48 -07:00
Glenn Kasten
39581f9248 Merge "IAudioFlinger::createTrack and openRecord flags" 2012-03-26 07:16:37 -07:00
Daniel Sandler
9ea03b9f29 Merge "Add remotable methods for TextView's compound drawables." 2012-03-26 06:51:28 -07:00
Craig Mautner
c9f67764a8 Merge "Skip layout if performShow fails." 2012-03-25 22:01:18 -07:00
Craig Mautner
cf8cbbe774 Skip layout if performShow fails.
In cases where a Surface does not go from hidden to shown, do not set
the perform layout flag. This keeps us out of repeated passes through
the layout code.

Fixes bug 6222487.

Change-Id: I22601bef5733d2f996a8cbdd50d6b89517bc3122
2012-03-25 21:54:36 -07:00
satok
83e675f5ec Support UntranslatableReplacementStringInSubtypeName
Bug: 6210256

Change-Id: I54016f2dcfc6563ed3753e1d4fa1bbd2cfb9d08c
2012-03-26 12:30:23 +09:00
Jesse Wilson
f5fb5e8096 Add an API to expose Next Protocol Negotiation (NPN).
Bug: http://b/4190756
Change-Id: If904f7ff440391a6adb2963eb2ecb990140ab7cc
2012-03-25 19:43:01 -04:00
Colin Cross
8dd6574809 remove jni.h include from IOMX.h
jni.h is not used in IOMX.h and is not available in pdk builds,
remove it.

Change-Id: I9bc8fd70f617942712d9f684c6fc927bf18be753
2012-03-24 15:35:17 -07:00
James Dong
23918f2144 Merge "Remove JNI in LOCAL_C_INCLUDE from non-JNI related Android.mk files." 2012-03-24 12:31:46 -07:00
James Dong
209cfdf4f6 Remove JNI in LOCAL_C_INCLUDE from non-JNI related Android.mk files.
o related-to-bug: 6214141

Change-Id: Ic88d1732b3e014af47532a0809e01f6086e8464d
2012-03-24 10:59:14 -07:00
James Dong
062ed957e0 Fixed missing return value from a method should have returned status_t
Change-Id: I83ad2735eaf8a8dfa5f8f29f30aec1311b3222de
2012-03-24 10:15:18 -07:00
James Dong
3b3a5b100b Merge "VideoEditorMain.h is moved to /frameworks/av/libvideoeditor and thus can be deleted." 2012-03-24 09:57:06 -07:00
James Dong
6e3bceef9c VideoEditorMain.h is moved to /frameworks/av/libvideoeditor and thus can be deleted.
o this is to resolve undesirable dependency of /frameworks/av/libvideoeditor on /frameworks/base/media/jni
o related-to-bug: 6214141

Change-Id: I62d08a7789ecb34d35cd22d2e6f68c3510c9bd90
2012-03-24 09:42:59 -07:00
Daniel Sandler
820ba323f9 Add remotable methods for TextView's compound drawables.
Change-Id: I67445e5b1d4a571020dfcd551ab00bd83a8eb536
2012-03-24 09:56:10 -05:00
Romain Guy
d4577c0c29 Merge "Destroy the hardware renderer when ViewRootImpl's die is post-poned Bug #6109035" 2012-03-23 19:05:50 -07:00
Romain Guy
a998dff5d4 Destroy the hardware renderer when ViewRootImpl's die is post-poned
Bug #6109035

ViewRootImpl.die() can be invoked in such a way that doDie() will be
executed later. On memory limited device, an eglTerminate() may happen
before doDie() is executed which leads to unstable behaviors. This
change makes sure the renderer is destroyed as soon as possible.

Change-Id: I3322410cdd744b464951e2055aeade6069d1d673
2012-03-23 19:04:36 -07:00
Yu Shan Emily Lau
660b014daa Merge "Insert 2 seconds wait in each test case setup. This is the work around for the surface request race condition." 2012-03-23 18:53:18 -07:00
Nick Kralevich
7ac3ed1d76 resist umask changes, make dirs 0711
Make sure /data/user directory permissions get explicitly set
regardless of the system umask.

Change directory permissions to 0711. No need for read permissions.

Bug: 3272072
Change-Id: Ida7f3c6656f4e0c9d0a9f7648491cc853c4e44ca
2012-03-23 18:00:47 -07:00
Yu Shan Emily Lau
003a756974 Insert 2 seconds wait in each test case setup.
This is the work around for the surface request race
condition.

Change-Id: Iaf8be12cfe4eb70d0a309ad875f38427181ac4b4
2012-03-23 17:58:49 -07:00
Christopher Tate
a6deda436b Merge "Don't crash when wiping backup data redundantly in the local transport" 2012-03-23 17:52:25 -07:00
Christopher Tate
0abf6a0014 Don't crash when wiping backup data redundantly in the local transport
Previously, if using the "local" debugging transport:

    adb shell bmgr wipe com.android.browser
    adb shell bmgr wipe com.android.browser

... would bring down the runtime.  This no longer happens.  The fix
covers two aspects of the situation:  1. the local transport no longer
blows up in this use case, and 2. the backup manager itself now catches
blowups on the part of the transport, and tidies up after them.

Bug 6205185

Change-Id: Ieb9b8827a62523148ad5a0ec15b05a954d198b3d
2012-03-23 17:47:58 -07:00
Jeff Sharkey
0c44525a48 Merge "Copy EXTRA_STREAM into ClipData and grant." 2012-03-23 17:09:13 -07:00
Mathias Agopian
2cd24ecf61 Merge "move ndk headers to frameworks/native" 2012-03-23 16:46:19 -07:00
Marco Nelissen
c164faa831 Speed up playlist processing
The recent removal of the cache from MediaScanner (commit 58ef68905d67e356eb)
slowed down processing of playlists, in some cases significantly, due to every
line in a playlist prompting a query that looped over the entire audio table.

With this change, the query is only done once instead of for every line,
and the code starts iterating over the Cursor starting near the point of
the last match, instead of from the start. The latter is especially helpful
when the entire query result is too large to fit in a CursorWindow, since
it reduces the number of times that sqlite has to perform an offset query
under the hood to refil the window.

Change-Id: I9fea990b3b8c86571384de2122708fb7e809c355
2012-03-23 16:37:50 -07:00
Xavier Ducrohet
fbd0509f47 Merge "Add Delegate for ViewRootImpl#isInTouchMode to prevent IPC call in Eclipse." 2012-03-23 16:29:50 -07:00
Craig Mautner
d5f2374e13 Merge "Reset layout needed at each animation step." 2012-03-23 16:20:47 -07:00
Craig Mautner
bb1449b392 Reset layout needed at each animation step.
The member variable WindowAnimator.mPendingLayoutChanges was never
being reset to 0. Consequently once it was set it was causing endless
calls to the layout method.

Fixes bug 6208114, 6220403, 6219546.

Fixed NPE in RecentsPanelView.

Change-Id: Ie529b8f31e535543cb5ae0af9447146306b14eeb
2012-03-23 16:11:14 -07:00
Xavier Ducrohet
22f700a1b8 Add Delegate for ViewRootImpl#isInTouchMode to prevent IPC call in Eclipse.
Also fix some new/removed method from BitmapFactory.

Change-Id: I606bd8bee6ff1e2c6c9472b4672175bfdaff45de
2012-03-23 16:07:23 -07:00
Jason Sams
9321ad6a75 Merge "Add getSizeBytes and cleanup docs." 2012-03-23 15:52:53 -07:00
Jason Sams
36c0f64658 Add getSizeBytes and cleanup docs.
Change-Id: I854a41f50378590b58bfbb205906ed4bee440411
2012-03-23 15:48:37 -07:00
Jason Sams
219e6b9dae Merge "Cleanup Allocation docs and getter funcs." 2012-03-23 15:47:00 -07:00
Jeff Sharkey
678d04f1b6 Copy EXTRA_STREAM into ClipData and grant.
When sending SEND or SEND_MULTIPLE intents, copy any EXTRA_STREAM
Uris to ClipData and set GRANT_READ_URI_PERMISSION flag.

Bug: 6216357
Change-Id: I3c9b0d1d4b7e0c4655b47c4192150b0c3641e0e8
2012-03-23 15:45:37 -07:00
Jeff Brown
cc001fdaf0 Merge "Provide an API for enabling foreign key constraints." 2012-03-23 15:39:02 -07:00
Jeff Sharkey
69f819b397 Merge "Include GIDs for unenforced permissions." 2012-03-23 15:21:00 -07:00
Dianne Hackborn
7cf4640e81 Merge "Add new thumbnail animation." 2012-03-23 15:00:59 -07:00
Mathias Agopian
60b82263a1 move ndk headers to frameworks/native
Change-Id: I44e48b8993e8b574ae366b9e76629099154998a9
2012-03-23 14:59:35 -07:00
Mathias Agopian
3e93e433e2 Merge "add missing include" 2012-03-23 14:58:19 -07:00
Mathias Agopian
7efec15fef add missing include
Change-Id: I7eb05f6cb6de170aeb3b72d28490cdcf46982d13
2012-03-23 14:57:16 -07:00
Jeff Brown
96496adb61 Provide an API for enabling foreign key constraints.
Also provide a lifecycle method on SQLiteOpenHelper so that
applications can configure things like this before the onCreate,
onUpgrade, onDowngrade and onOpen callbacks run.

Change-Id: If3d1396720bd2e032dd9e034733fb1ff9a9733dd
2012-03-23 14:49:39 -07:00
Eric Fischer
a7b4ad46ec Merge "Import translations. DO NOT MERGE" 2012-03-23 14:20:57 -07:00
Eric Fischer
6379312c04 Merge "Import translations. DO NOT MERGE" 2012-03-23 14:20:45 -07:00