29079 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
Fabrice Di Meglio
b934db7e3e Reduce memory footprint for View (part 2)
- make textDirection use private bits field
- update layoutDirection usage of private bits

Change-Id: Ib9f4da58dbb74f410fb9d3be3c26ef02579aaf1d
2012-03-22 13:40:29 -07:00
Jeff Sharkey
370f2dbc37 Merge "Move network policy to per-appId (instead of UID)." 2012-03-22 11:13:54 -07:00
Jeff Sharkey
8a8b581e66 Move network policy to per-appId (instead of UID).
To support multi-user, store network policy per-appId and expand to
apply rules to all UserInfo on device.

Bug: 6140462
Change-Id: Ic0866b4d41c8c60cc1c0a597f0de927b92b65b1e
2012-03-22 11:02:43 -07:00
Michael Kolb
b909b6a148 Merge "Monkey protection" 2012-03-22 10:56:32 -07:00
Michael Kolb
87a435a69d Monkey protection
Bug: 6191709

Change-Id: I0bc16f7970bda6b3f5ae3b5d59e3fbdee09a4956
2012-03-22 10:33:50 -07:00
Daniel Sandler
648e78f96f Merge "Notification actions API." 2012-03-22 10:24:00 -07:00
Amith Yamasani
483f3b06ea Package restrictions per user
Packages can be enabled/disabled per user.
This requires maintaining stopped/launched states and
enabled / disabled components and packages per user.

Refactored pm.Settings and PackageSettingsBase to keep
track of states per user.

Migrated the stopped-packages.xml to users/<u>/package-restrictions.xml

Changed intent resolution to handle individual user restrictions.
Bunch of IPackageManager calls now have a userId argument.
Make AppWidgetService handle removals of packages.

Added some tests for pm.Settings and PackageManager.

Change-Id: Ia83b529e1df88dbcb3bd55ebfc952a6e9b20e861
2012-03-22 10:08:24 -07:00
Chet Haase
af0c843672 Merge "Disable DisplayList properties" 2012-03-22 08:40:51 -07:00
Jonathan Dixon
6ceac10e54 Merge changes Id1109157,I44343a72
* changes:
  Remove spurious @hide comments.
  Remove spurious checkThread() method
2012-03-22 08:34:17 -07:00
Chet Haase
ad13c81371 Disable DisplayList properties
DisplayList properties are (again) disabled by default, via flags in
View.java and DisplayListRenderer.h. There are various artifacts to
chase down before enabling by default.

Issue #6198472 Native crash at pc 00076428 in many different apps in JRM80
Issue #6204173 Date/time picker isn't rendering all parts of UI
Issue #6203941 All Apps overscroll effect is rendered weirdly/has flickering
Issue #6200058 CAB rendering issue - not drawing items?
Issue #6198578 Front camera shows black screen after taking picture.

Change-Id: I045dc82ce1d85fedbae3bb88eb2a2dfb6891d41f
2012-03-22 08:33:09 -07:00
Danielle Millett
6fafad3b75 Merge "Added a setting for whether biometric weak liveliness is enabled." 2012-03-22 07:47:58 -07:00
Danielle Millett
925a7d8f06 Added a setting for whether biometric weak liveliness is enabled.
The liveliness setting is represented by a bit in
LOCK_BIOMETRIC_WEAK_FLAGS so that more settings can be added if needed.

Change-Id: Ia6c94396d5b84de61f7eeb9a192d0aa925b13507
2012-03-22 10:31:37 -04:00
Jonathan Dixon
cd93e15c09 Remove spurious @hide comments.
The whole class is now hidden, so these are no longer needed

Change-Id: Id110915778346daf9f58e100d5b81cf8382ef3db
2012-03-22 13:21:22 +00:00
Jonathan Dixon
fd2467d779 Remove spurious checkThread() method
This is now handled in WebView.java

Change-Id: I44343a72d993598267deaa6a9e1900b963bf3cb3
2012-03-22 13:21:22 +00:00
Steve Block
20a75451d1 Remove superfluous @hide annotations from WebSettingsClassic
This entire class is now hidden

Change-Id: Idb6c49b2e66e515e0979ac73e95dacfef8d18d23
2012-03-22 12:56:13 +00:00
satok
31e4e14994 Re-start input when the IME is deactivated but window is focused
Bug: 6188159
Change-Id: I9189e6d2ac90aa8c621fdb44989728101e00329d
2012-03-22 15:34:16 +09:00
Jeff Brown
bf79293e70 Merge "Avoid calling into JNI if not needed." 2012-03-21 20:04:03 -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
Jean-Baptiste Queru
7364477528 Fix typo... and build
Change-Id: Ifc3c99c1e43423d0419031c7a389738b2232c6bd
2012-03-21 19:24:32 -07:00
Daniel Sandler
a0a938cd5f Notification actions API.
Actions will be attached to the Notification object and also
used to inject additional tap targets in the default
template used by Builder.

Change-Id: Idd58686b9c44b2ca7bb9ec5aa8337f3bdce5b878
2012-03-21 22:13:30 -04:00
Jeff Brown
2d00872467 Merge "Throw if WAL enabled/disabled when connections are in use." 2012-03-21 18:30:50 -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
Adam Powell
3004cc50f2 Add SeekBar property accessors to match available style attributes
Bug 6103624

Change-Id: I7bc863250f3b156cf6663e484baab2c35a949db5
2012-03-21 17:51:30 -07:00
Adam Powell
0b7413d5d6 GridView attribute updates
Bring GridView's API in sync with its supported style attributes.

Bug 6103758

Change-Id: Ib2c4d4d48061d23a7d886364965f0cb50c239e5d
2012-03-21 15:35:39 -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
71747d1007 Merge "Import translations. DO NOT MERGE" 2012-03-21 13:19:01 -07:00
Eric Fischer
6e05e37a58 Import translations. DO NOT MERGE
Change-Id: I4c22ac70a03bfc348fc201415c5a4e432d1add53
2012-03-21 12:38:30 -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
e5b2b644b1 Merge "Remove unused android.net.Downloads." 2012-03-20 18:00:29 -07: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
Amith Yamasani
525a058c00 am 65e4b90d: am 31f7ef24: am 90e3bcae: Increase line limit for summary text
* commit '65e4b90d6cc3673e70b6b94fa1566e31eb44ffc7':
  Increase line limit for summary text
2012-03-20 17:54:57 -07:00
Steven Ross
848763daea Merge "Adding lock icon to FaceLockAreaView on lockscreen fixes 5394522" 2012-03-20 17:39:06 -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
08cfd61d6e Merge "Put back invalidate optimization" 2012-03-20 14:24:17 -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
e3aad16ec0 Merge "Code cleanup" 2012-03-20 13:52:35 -07:00