69849 Commits

Author SHA1 Message Date
Jeff Brown
d67c8c6789 Work around problems changing the database journal mode.
Because we always disable WAL mode when a database is first opened
(even if we intend to re-enable it), we can encounter problems if
there is another open connection to the database somewhere.
This can happen for a variety of reasons such as an application opening
the same database in multiple processes at the same time or if there is a
crashing content provider service that the ActivityManager has
removed from its registry but whose process hasn't quite died yet
by the time it is restarted in a new process.

If we don't change the journal mode, nothing really bad happens.
In the worst case, an application that enables WAL might not actually
get it, although it can still use connection pooling.

Bug: 6124556
Change-Id: Ia2ffdbbc8f82721b170f3bf71bd5242dfd56d9ac
2012-03-22 14:53:01 -07:00
Jeff Brown
9ea77fc821 Avoid calling into JNI if not needed.
Short-circuit a few MotionEvent JNI calls in simple cases.

Change-Id: I6c97c06b5a5fd203a423dc88f428637b9dec71ae
2012-03-21 19:49:54 -07:00
Jeff Brown
e67ca420e4 Throw if WAL enabled/disabled when connections are in use.
Changing WAL mode requires obtaining an exclusive lock on the
database and can only be done when there are NO other active
database connections.

Check that this is really the case, and bail with a useful
error message if an application attempts to change WAL mode while
transactions are in progress.

Expose disableWriteAheadLogging() in the API.

Change-Id: I87599de3b88c53dcd75677aefd72e40de216c2c1
2012-03-21 18:08:09 -07:00
Marco Nelissen
3e6792232a Merge "Add MetaData::dumpToLog" 2012-03-21 15:12:44 -07:00
Marco Nelissen
d0a524fb59 Add MetaData::dumpToLog
Utility method for dumping the content of a MetaData object to the log.

Change-Id: I2d91b991e1d9fed2215e8995a73c2b1854205074
2012-03-21 15:00:27 -07:00
Adam Powell
63b9e973e5 Merge "Fix LayerDrawable#mutate" 2012-03-21 14:56:10 -07:00
Adam Powell
26e35fca60 Fix LayerDrawable#mutate
Change-Id: I985b80141ffc96db969eaf36538df938cb093661
2012-03-21 14:53:39 -07:00
George Mount
9a69fea81d Merge "Fix location of selection handles on rotated text." 2012-03-21 14:16:17 -07:00
Alex Sakhartchouk
8564be6d84 Merge "Breaking up rs headers by logical components." 2012-03-21 14:05:35 -07:00
George Mount
b6f3339a8d Fix location of selection handles on rotated text.
Bug 6206177

Change-Id: If4509b75aa2f71f80e44e3820f69e1844534bed2
2012-03-21 13:51:50 -07:00
Eric Fischer
88796897d3 Restore deleted string still referenced from public.xml.
Change-Id: I738c1ef185b306f5a25afc6ed4b0f46a14e3c6a7
2012-03-21 13:38:55 -07:00
Eric Fischer
93efd599f8 Merge "Import translations. DO NOT MERGE" 2012-03-21 13:19:12 -07:00
Eric Fischer
71747d1007 Merge "Import translations. DO NOT MERGE" 2012-03-21 13:19:01 -07:00
Eric Fischer
7bf371e200 Import translations. DO NOT MERGE
Change-Id: Ie99a723075c6e17d413dc055bc52feb81b1db73f
2012-03-21 12:49:52 -07:00
Eric Fischer
6e05e37a58 Import translations. DO NOT MERGE
Change-Id: I4c22ac70a03bfc348fc201415c5a4e432d1add53
2012-03-21 12:38:30 -07:00
Craig Mautner
d5c88b51f7 Merge "Continue animations started from AppWindowToken." 2012-03-21 12:13:24 -07:00
Romain Guy
4d6e0788a8 Merge "Plug memory leak. Bug #6196903" 2012-03-21 11:59:48 -07:00
Romain Guy
b0317984d3 Plug memory leak.
Bug #6196903

Whenever a memory flush happens, the GL renderer discards some or all of its
font caches. Each font cache holds an array of vertex indices that was
initially designed to have the same life cycle as the process. This changed
when memory flushes were introduced but this array was never taken care of
in the destructor.

Change-Id: Ief124f609ea55b671c0a9b43637d9e013629ebaa
2012-03-21 11:52:52 -07:00
Craig Mautner
03273d00ce Continue animations started from AppWindowToken.
Animations that were started from AppWindowToken.showAllWindowsLocked
were not setting mInnerFields.mAnimating and hence the animations were
not progressing. This resulted in popups such as menus and time/date
settings not showing up.

Fixes bug 6205076.

Change-Id: I4daae5895e64182328671e282331f14dd5561d5e
2012-03-21 11:52:40 -07:00
Chet Haase
b6f90cf846 Merge "Fix Animation bugs from DisplayList properties integration" 2012-03-21 11:34:16 -07:00
Chet Haase
89b7f2e3be Fix Animation bugs from DisplayList properties integration
The new DisplayList properties functionality does not currently handle Animation
(android.view.animation) functionality, so we fall back to the previous approach
of redrawing the DisplayList when an Animation changes alpha/transform data for
a View. The DL code was not, however, correctly using that logic, so that
the Animation transform information was being ignored, or at least not set
correctly on the DisplayList during redraws.

This fix accounts for Animation changes and sets up the DisplayList correctly.

Change-Id: I9f6e0382b05d0627f4779f30e74641dedcc77f82
2012-03-21 11:32:02 -07:00
Wink Saville
a4368604d0 Merge "Telephony: Remove coupling between phone and IccRecords" 2012-03-21 11:31:12 -07:00
Craig Mautner
4de35e1402 Merge "Override not drawing to screen when screen is off." 2012-03-21 11:07:43 -07:00
Craig Mautner
006f0e41ab Override not drawing to screen when screen is off.
A new test had been added to performDraw to provide an early return if
the screen was off. Drawing should have proceeded however if
mReportNextDraw is set. Otherwise views that turn on the screen (such
as the alarm) are not shown.

Fixes bug 6168158.

Change-Id: If9013d9dbd39d60ee1de8aeb3e0c1facbc5a7db5
2012-03-21 11:00:32 -07:00
George Mount
8dc8a435a1 Fix merge error
Change-Id: Ia48e1f064b697fa328e5d582862dbe723f7ffd5d
2012-03-21 10:52:56 -07:00
George Mount
f3616da6a8 Merge "Make paste window and caret handle show up at the right time." 2012-03-21 10:29:08 -07:00
Marco Nelissen
ceb0909bc2 Merge "Parse gapless info from mp4 files" 2012-03-21 10:16:55 -07:00
Alex Sakhartchouk
79c23f0f88 Breaking up rs headers by logical components.
Change-Id: I2d23eec0277b1136852b8a7acb61aecf6f699a7d
2012-03-21 09:58:15 -07:00
Marco Nelissen
eb473f3627 Parse gapless info from mp4 files
Change-Id: I4c83d4e12e996dc29708268e68a4bb74b368c6f3
2012-03-21 09:50:53 -07:00
Craig Mautner
6d332c5148 Merge "Minor refactoring prior to major refactoring." 2012-03-21 09:21:39 -07:00
The Android Open Source Project
ad32461ec1 am fcf2f4b1: am 98e1b541: Reconcile with ics-mr1-release
* commit 'fcf2f4b17338501d8498a2a16eb832445b293e8f':
2012-03-21 09:09:04 -07:00
The Android Open Source Project
fcf2f4b173 am 98e1b541: Reconcile with ics-mr1-release
* commit '98e1b541f271e92b9dc25d54e275c28102746b04':
2012-03-21 09:06:34 -07:00
The Android Open Source Project
98e1b541f2 Reconcile with ics-mr1-release
Change-Id: Id19190393a665dd1b07c073970925758aa383691
2012-03-21 09:00:43 -07:00
The Android Open Source Project
959fd880ea am a4a09465: am 35a8f94d: Reconcile with ics-mr1-release
* commit 'a4a09465569d0f4cce36f089fa02d5ef9b95db81':
  Fix 5960562: Show emergency button on PukUnlock screen
2012-03-21 08:29:33 -07:00
Glenn Kasten
4351d4aa8e Merge "Clean up Track constructor" 2012-03-21 08:29:18 -07:00
The Android Open Source Project
a4a0946556 am 35a8f94d: Reconcile with ics-mr1-release
* commit '35a8f94da6a8a3a6757e5663bfcbcd044f72a92a':
  Fix 5960562: Show emergency button on PukUnlock screen
2012-03-21 08:26:56 -07:00
The Android Open Source Project
35a8f94da6 Reconcile with ics-mr1-release
Change-Id: I10d78e60e39606f85cfa6fc7e9a7da14db0eeb0a
2012-03-21 08:23:03 -07:00
Glenn Kasten
004f9bac41 Merge "AudioMixer can be configured for fewer max tracks" 2012-03-21 08:19:04 -07:00
Glenn Kasten
652e18d896 Merge "Update comments" 2012-03-21 07:24:21 -07:00
Glenn Kasten
32d72b2f53 Merge "Whitespace" 2012-03-21 07:22:40 -07:00
Glenn Kasten
85b51b8ae3 Merge "new doesn't fail on Android" 2012-03-21 07:21:21 -07:00
Alex Yakavenka
80198f2235 Telephony: Remove coupling between phone and IccRecords
Change-Id: I7af0f0f37c59b7554fa329a5b00ff28cb149b4d9
2012-03-21 04:00:13 -07:00
Jonathan Dixon
a6c4d8e018 Rename getWebView() to getWebViewClassic
Interdepends on https://android-git.corp.google.com/g/170037
Tidys up a TODO from my webview proxy patch.
This allows me to re-introduce getWebView(), but now returning the
actual WebView instance which is needed by my upcoming change to WebKit
linked above.
Also moves sendPluginDrawMsg() to WebViewCore for convenience in the
MediaTexture code that calls this.

Change-Id: I57b72504a792de58d15f386abf4a9d821449ab0a
2012-03-21 07:59:58 +00:00
Jim Miller
cdbf566770 am a612fad1: am 890266fa: am 928d3470: Fix 5960562: Show emergency button on PukUnlock screen
* commit 'a612fad1f18fb9f4f8f5258faa0ccfc4d9ec1788':
2012-03-20 19:36:35 -07:00
Jim Miller
d16a4f2967 am d5b5db73: am b7a6f5d7: am 928d3470: Fix 5960562: Show emergency button on PukUnlock screen
* commit 'd5b5db73fcb49a4ca04e9cefc5f5293faba5895e':
  Fix 5960562: Show emergency button on PukUnlock screen
2012-03-20 19:36:33 -07:00
Eric Laurent
56b21c6ccd am d58b6cd1: am cbc90453: am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1
* commit 'd58b6cd1e3fdf3deb5147daec556fe424a568732':
2012-03-20 19:35:56 -07:00
Eric Laurent
c485824804 am a48285c4: am 165ee4c5: am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1
* commit 'a48285c4f22ffc43f1771ebd1ff35dcec48db2c7':
  audioflinger: fix issue with camcorder and A2DP
2012-03-20 19:35:53 -07:00
Joe Fernandez
7740348a20 am c2c444f5: am f9737a89: am dbab18f6: Merge "docs: Android SDK r17 (RC6) Release Notes" into ics-mr1
* commit 'c2c444f5a8e9d483c7a413d4050b305154690de6':
2012-03-20 19:35:52 -07:00
Joe Fernandez
88b7849293 am 58a0ea9c: am 9018447a: am dbab18f6: Merge "docs: Android SDK r17 (RC6) Release Notes" into ics-mr1
* commit '58a0ea9c2d5042e5b94cbc5416d08f1e8a75a94d':
  docs: Android SDK r17 (RC6) Release Notes
2012-03-20 19:35:49 -07:00
Justin Ho
565cfb3c30 am 68f4ffb4: (-s ours) am 47ec443a: am 972d12aa: Merge "DO NOT MERGE Revert "Increase line limit for summary text"" into ics-mr1
* commit '68f4ffb4358842482e8b86b2afbbce4a4ed6135e':
2012-03-20 19:35:47 -07:00