73492 Commits

Author SHA1 Message Date
Jeff Brown
df78cd5ee9 Merge "Work around problems changing the database journal mode." 2012-03-22 15:07:48 -07:00
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
Andreas Huber
4355b001cb Merge "Use NuPlayer for media playback everywhere" 2012-03-22 14:00:53 -07:00
Wink Saville
3558486c13 Merge "Telephony: Move Cat to IccCard" 2012-03-22 13:54:09 -07:00
Christopher Tate
4b212786c5 am 96fecb7f: Merge "Make immersive mode public & imply update locking" into ics-aah
* commit '96fecb7f6b74176c0fad7bfa2c7ae9b80e1770cc':
  Make immersive mode public & imply update locking
2012-03-22 13:41:30 -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
Christopher Tate
96fecb7f6b Merge "Make immersive mode public & imply update locking" into ics-aah 2012-03-22 13:39:21 -07:00
Andreas Huber
8686938aa5 Use NuPlayer for media playback everywhere
if media.stagefright.use-nuplayer is set to true.

Change-Id: Ibb217e7d7d5195b7feeea557554fe78e1585744c
2012-03-22 13:18:08 -07:00
Jeff Sharkey
dee7e2ac0c Merge "Fix test breakage." 2012-03-22 12:38:28 -07:00
Jeff Sharkey
4b63d69759 Fix test breakage.
Change-Id: I2c5fc8c3bf7795ccdd474caa3f858e9a56f026ed
2012-03-22 12:36:45 -07:00
Jack Palevich
f7f4c20605 Merge "Remove EGL context limit for Adreno GPUs." 2012-03-22 11:47:30 -07:00
Jack Palevich
2ffead9cf2 Merge "Ignore EGL_BAD_CURRENT_SURFACE errors from eglSwapBuffers" 2012-03-22 11:46:32 -07:00
John Grossman
b7536cf1ab am 6becc5a8: LibAAH_RTP: Fix an issue which crept in during code review.
* commit '6becc5a811c74a20e72eb8e81fdc5d21361d2d7f':
  LibAAH_RTP: Fix an issue which crept in during code review.
2012-03-22 11:34:42 -07:00
John Grossman
6becc5a811 LibAAH_RTP: Fix an issue which crept in during code review.
Fix a mistake which came in as part of a merge conflict resolution
during code review of the recent unicast mode refactor of LibAAH_RTP.
Nop packet which were supposed to carry TS transformations for the
pause state accidentally got flagged as Flush operations.  The flush
packet successfully carried the TS transformation, but also had the
undesired side effect of constantly flushing the stream.

Change-Id: I4c6aa0043fc274a1d7e880ed1d19cf277f22194b
Signed-off-by: John Grossman <johngro@google.com>
2012-03-22 11:30:09 -07:00
Jeff Sharkey
370f2dbc37 Merge "Move network policy to per-appId (instead of UID)." 2012-03-22 11:13:54 -07:00
Glenn Kasten
bf30911bf1 Merge "Remove enforceFrameCount" 2012-03-22 11:06:49 -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
Alex Sakhartchouk
043f5ced1b More rearrangement and renaming.
Change-Id: Ia922c5bff1734a29b786ba95065f81c8dedf90cd
2012-03-22 10:50:55 -07:00
Michael Kolb
87a435a69d Monkey protection
Bug: 6191709

Change-Id: I0bc16f7970bda6b3f5ae3b5d59e3fbdee09a4956
2012-03-22 10:33:50 -07:00
Andrew Hsieh
b849e6c68d am 52058b4b: (-s ours) am 1c4c320d: am 3347d659: am 1f9e7499: Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
* commit '52058b4b55b0f918473d9887a80f4cd78ecc45e4':
  Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
2012-03-22 10:28:16 -07:00
Daniel Sandler
648e78f96f Merge "Notification actions API." 2012-03-22 10:24:00 -07:00
Andrew Hsieh
52058b4b55 am 1c4c320d: am 3347d659: am 1f9e7499: Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
* commit '1c4c320da7832129621e9e44d3f8d8902cb58462':
  Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
2012-03-22 10:22:24 -07:00
Marco Nelissen
66331b9c99 Merge "Support gapless playback for mp3 and m4a" 2012-03-22 10:18:59 -07:00
Andrew Hsieh
1c4c320da7 am 3347d659: am 1f9e7499: Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
* commit '3347d6597bd6214f037825e41be7e58198d9079d':
  Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
2012-03-22 10:18:59 -07:00
Andrew Hsieh
3347d6597b am 1f9e7499: Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
* commit '1f9e749914c7c636bd759da0209e68d5801407ac':
  Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
2012-03-22 10:16:42 -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
Marco Nelissen
da9deca7ba Support gapless playback for mp3 and m4a
Gapless playback for appropriately tagged mp3 and m4a files.
Currently this is implemented in OMXCodec, which most players
use, but should be easy to support in other players as well by
using the SkipCutBuffer utility class.

Change-Id: I748c669adc1cfbe5ee9a7dea2fad945d48882551
2012-03-22 10:06:03 -07:00
Russell Brenner
7b0b897c54 Improved comments for vendor fonts xml
Change-Id: I9dd7c8971df0a2862de316e096c1b6d60658814a
2012-03-22 09:55:54 -07:00
Andrew Hsieh
1f9e749914 Added rules to build f/b/libs/utils in 64-bit: lib64utils.a
It's needed to build four shared libraries in 64-bit for 64-bit
emulator with "-gpu on"
  lib64OpenglRender.so
  lib64EGL_translator.so
  lib64GLES_CM_translator.so
  lib64GLES_V2_translator.so

Change-Id: Ia6c05b23df1e9cd9e7f2e94e4cd5bde4be5d336b
2012-03-22 09:46:46 -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
83cc2d9415 Fixed the build: Removed hidden api change from current.txt
Change-Id: I126306a1a61dd9bee0bc2f719eecba15500cd859
2012-03-22 11:13:56 -04: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
Glenn Kasten
222dfc784e Merge "Split libmedia into libmedia and libmedia_native" 2012-03-22 07:14:27 -07: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
ef08c1cd91 Merge "GridView attribute updates" 2012-03-21 17:04:28 -07:00
Joe Fernandez
aef46a61be am 34da2ffe: am f20ebda6: am 66f1bafb: Merge "docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)" into ics-mr1
* commit '34da2ffe246aaf2baa3dd738f045cb9502636f54':
2012-03-21 16:51:58 -07:00