69894 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Joe Fernandez
bb21b623d7 am 5a8fb372: am 9eea8881: am 66f1bafb: Merge "docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)" into ics-mr1
* commit '5a8fb3727f14a7c3a68b6e0f9bbc10704e26d5d1':
  docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)
2012-03-21 16:49:27 -07:00
Joe Fernandez
34da2ffe24 am f20ebda6: am 66f1bafb: Merge "docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)" into ics-mr1
* commit 'f20ebda6efb711d1cda132ae89439e7aed5944f1':
2012-03-21 16:47:34 -07:00
Joe Fernandez
5a8fb3727f am 9eea8881: am 66f1bafb: Merge "docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)" into ics-mr1
* commit '9eea888105b3d8d69a28e2dea840808d394f07b9':
  docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)
2012-03-21 16:46:38 -07:00
Joe Fernandez
9eea888105 am 66f1bafb: Merge "docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)" into ics-mr1
* commit '66f1bafb2326e12814df703a4285373e8651a3ce':
  docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)
2012-03-21 16:43:33 -07:00
Joe Fernandez
f20ebda6ef am 66f1bafb: Merge "docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)" into ics-mr1
* commit '66f1bafb2326e12814df703a4285373e8651a3ce':
  docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)
2012-03-21 16:43:29 -07:00
Joe Fernandez
66f1bafb23 Merge "docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)" into ics-mr1 2012-03-21 16:41:19 -07:00
Joe Fernandez
1e72b34f11 docs: Android SDK r17 (RC7) Release Notes (fix for build feature info)
Change-Id: Id10c2d5eec9f81d1c6ce52067b7e25b7f411d91c
2012-03-21 16:25:21 -07:00
Glenn Kasten
0a3edd38df Split libmedia into libmedia and libmedia_native
This is still in the old location

Change-Id: Ic1be549b5b607cfd519cb4cecc581624510a4ee1
2012-03-21 15:45:29 -07:00
Glenn Kasten
2333a27ee5 Remove enforceFrameCount
It was only used to decide whether to issue a warning.
The warning was issued the first time track was created but
not at re-creation.  Now it is a verbose message every time,
not a warning since it happens all the time with key clicks on A2DP.

Change-Id: I9d39f53c0a7eb84b666e55b1b76ff830cf8f37ba
2012-03-21 15:41:02 -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
Alex Sakhartchouk
b09aaeca08 Merge "Changing rsg to rs where functions don't rely on graphics." 2012-03-21 15:31:25 -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