22863 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
George Mount
b6f3339a8d Fix location of selection handles on rotated text.
Bug 6206177

Change-Id: If4509b75aa2f71f80e44e3820f69e1844534bed2
2012-03-21 13:51:50 -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
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
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
Jeff Sharkey
948eef8254 Remove unused android.net.Downloads.
It's another set of constants that can be confused with those in
android.provider.Downloads.

Change-Id: I78ac058fa264d59a81f7655ab101c3fb2c8c17ff
2012-03-20 17:58:27 -07:00
John Reck
127d4deab1 Merge "Don't contentInvalidate when changing a WebView property" 2012-03-20 16:54:59 -07:00
Jeff Sharkey
481cb7ea38 Merge "Remember when NetworkPolicy was inferred." 2012-03-20 16:54:51 -07:00
Jeff Sharkey
837f9242ae Remember when NetworkPolicy was inferred.
This helps future-proof NPMS if we need to correct default policies
after an upgrade.

Change-Id: I0ddfdeaf41757a46aeb867c91d495ccf981d544b
2012-03-20 16:52:20 -07:00
Fred Quintana
f57bdf3a2b Merge "Fix an initialization ordering bug due to the userprofile changes." 2012-03-20 16:19:45 -07:00
John Reck
9a5f56563f Don't contentInvalidate when changing a WebView property
Change-Id: I629671f1edffed945395eef182eeb6e8617e32de
2012-03-20 16:01:26 -07:00
Gilles Debunne
a4a26053ea Disabled display lists in TextView
Bug 6198276, bug 6193544, bug 6199959

The activation of display list properties on Monday 19th
broke the editable text behovior.

Disabling display lists to fix the blocking rendering
issues.

Change-Id: I5bd0584d1a34c6bb0af79ef45499154e9004eac1
2012-03-20 15:52:57 -07:00
Romain Guy
e72cf7341a Put back invalidate optimization
Change-Id: I6407e452deb44e50a50632961e960cf0bd39b09d
2012-03-20 14:23:09 -07:00
Fred Quintana
70e6190858 Fix an initialization ordering bug due to the userprofile changes.
Bug: 6194599
Change-Id: I6ebedec3b5f045374f216aa1419bfdb57141a80e
2012-03-20 14:10:16 -07:00
Romain Guy
e979e62ac7 Code cleanup
Change-Id: I390e92b4a778bd9dcde6535178c1a6b204b29fe4
2012-03-20 13:50:27 -07:00
Svetoslav Ganov
eb0b1da78f Merge "Revamp of the NumberPicker widget." 2012-03-20 12:14:37 -07:00
Svetoslav Ganov
d11e6151fe Revamp of the NumberPicker widget.
1. The number picker no longer shows up and down arrows, it
   has only three touch targets which are the currently selected number
   in the middle with a lesser one above and greater below, now what
   you touch is what you get, flingability and long press are still
   supported.

2. Removed the restriction for a View with an AccessibilityNodeProvider
   to not have any concrete children. If the View has a provider, then
   this provider is responsible for creating the AccessibilityNodeInfos
   for all its descendants, concrete and virtual. The number picker is
   a good example for such a case - it has a concrete input view and
   two virtual buttons as its children. This is a safe change since
   this behavior has not been released.

3. This patch also fixes bug where the number picker is stretched too
   much in the Theme theme.

bug:6177794
bug:5728294

Change-Id: I5fb370fe0b864a156f5f2aaf2de5f55f6b6d4e84
2012-03-20 12:13:06 -07:00
Fabrice Di Meglio
6077fc9b7f Merge "Reduce memory footprint for View" 2012-03-20 11:48:50 -07:00
Fabrice Di Meglio
edc1e59b34 Reduce memory footprint for View
- make layout direction use private bit fields
- fix also some Javadoc issues

Change-Id: I977a328d671b91aa82cb275767e3575f78695508
2012-03-20 11:45:36 -07:00
George Mount
f796fdfe6d Make paste window and caret handle show up at the right time.
Bug 6194009
 Webkit Change: I7f8bc7266df52a67245b0a971826fd14e0d715c5

Change-Id: I460db436bd79d8ff72b457b5878ffe468400031f
2012-03-20 10:37:29 -07:00
John Reck
3a382b58c8 Merge "Pipe down isHardwareAccelerated" 2012-03-20 10:01:55 -07:00
John Reck
1467868004 Merge "Include MotionEvent on ACTION_MOVE's TouchEventData" 2012-03-20 09:57:49 -07:00
Svetoslav Ganov
52c1055462 Merge "Revert "Revamp of the NumberPicker widget."" 2012-03-19 20:03:45 -07:00
Svetoslav Ganov
efd1c67779 Revert "Revamp of the NumberPicker widget."
This reverts commit 912ab8506ae6409ee7fa0323b217fefaf0bd9771
2012-03-19 20:03:29 -07:00
Jeff Sharkey
09f5aededa Merge "Selective enforcement of READ_EXTERNAL_STORAGE." 2012-03-19 19:24:04 -07:00
Dianne Hackborn
975e04c244 Merge "Fix build, forgot to add file." 2012-03-19 19:09:02 -07:00
Dianne Hackborn
6de01a9b03 Fix build, forgot to add file.
Change-Id: Ia4b632170471649d1e1eceaad8fec41729008659
2012-03-19 19:07:40 -07:00
Jeff Sharkey
edc84ee839 Selective enforcement of READ_EXTERNAL_STORAGE.
Store enforcement state of specific permissions, allowing them to be
selectively enforced. Currently supports READ_EXTERNAL_STORAGE, which
by default isn't enforced, but enforcement can be enabled at runtime.

Bug: 6131916
Change-Id: I4bcc215a2eb5e6507d6257b577311cbd13c77acf
2012-03-19 19:01:45 -07:00
Svetoslav Ganov
ca07bc1d35 Merge "Revamp of the NumberPicker widget." 2012-03-19 18:56:51 -07:00
Romain Guy
0084322750 Merge "Pre-scale bitmaps on the native heap" 2012-03-19 18:52:09 -07:00
Romain Guy
7b2f8b8fb7 Pre-scale bitmaps on the native heap
Change-Id: I9819b532b89a997ab775b31ffee46445f1d16e20
2012-03-19 18:47:06 -07:00
Dianne Hackborn
f1bdf65308 Merge "Start using the new activity options argument." 2012-03-19 18:21:12 -07:00
Adam Powell
ac0f18dcc7 Merge "Fix a bug where MenuItems would not return consistent results for item icons initialized from a drawable resource id." 2012-03-19 18:08:04 -07:00
Dianne Hackborn
7a2195cdd3 Start using the new activity options argument.
New class lets you make an options bundle defining a custom animation,
as an alternative to Activity.overridePendingTransition().

Change-Id: I8e209bf52398a98ab9f1bcafa1ec0a580dae57c0
2012-03-19 17:41:10 -07:00
Kenny Root
ab750c5e29 Merge "Add VPN UID to list in Process" 2012-03-19 17:26:23 -07:00
Jim Miller
5d189e12d7 Merge "Fix 6021938: Improved target support in lock screen" 2012-03-19 17:18:34 -07:00
Amith Yamasani
219be44a4f Merge "Bind to the correct instance of the authenticator service." 2012-03-19 17:01:23 -07:00
Amith Yamasani
34daa75260 Bind to the correct instance of the authenticator service.
Otherwise you will see authentication failures on secondary users' accounts.

Change-Id: Ia3f8427f68df6048cdca65710bf673ac12a2cddb
2012-03-19 16:14:23 -07:00
Adam Powell
c4852a3718 Fix a bug where MenuItems would not return consistent results for
item icons initialized from a drawable resource id.

Change-Id: Ieb5245b8fe0e11b2eb788143859da1c0b3657b9f
2012-03-19 15:35:46 -07:00
Kenny Root
26993b37d5 Add VPN UID to list in Process
The VPN user ID is defined in android_filesystem_config.h as 1016. Add
it to android.os.Process so it can be referred to in Java code.

Change-Id: If3da3765747afda4e5e0761e289c45eebc7cddd5
2012-03-19 15:07:53 -07:00
Teng-Hui Zhu
d49ea7f11e Merge "Don't allow enter full screen while still in full screen mode." 2012-03-19 15:04:35 -07:00
Jim Miller
b030476d19 Fix 6021938: Improved target support in lock screen
This adds the ability to enable or disable target icons based on the drawable
resource of the target.

It also fixes a bug where we'd show the camera while displaying
the PIN/PUK unlock screen or when it's disabled by DevicePolicyAdmin.

Minor simplification and cleanup KeyguardUpdateMonitor callbacks.

Change-Id: I33fad56a2203bc8b7bcd0300c20478711a56713a
2012-03-19 14:18:13 -07:00
Teng-Hui Zhu
2b64c5a6f7 Don't allow enter full screen while still in full screen mode.
bug:5504581
Change-Id: Ib4922ce2cdb89b24120f87177658ce94c483f118
2012-03-19 14:16:03 -07:00
Chet Haase
584eda7c99 Merge "Enable DisplayList properties" 2012-03-19 13:50:32 -07:00