84996 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
641c36f918 Merge into jb-mr1-dev
Change-Id: Iec56e4962bbc78309b20595352cce986fe62f68e
2012-09-25 09:34:07 -07:00
Romain Guy
e83221c547 Fix alpha channel computation with ColorMatrixColorFilter
Bug #7222476

There were two issues:
- Blending was ignored with color filters
- The addition vector of a color filter was treated as integer values
  instead of float values

Change-Id: Id94065704a30ee8aaaa5724a9f3a3cff7c50ced7
2012-09-25 09:33:22 -07:00
Martijn Coenen
f8538594fe Fix build.
Bug: 7222958
Change-Id: I2f9ff988f09be6cd4be49bfb90750a46e63c2c14
2012-09-25 09:31:50 -07:00
Jean-Baptiste Queru
1b24275976 Merge into jb-mr1-dev
Change-Id: Ie68309c7525b59f12b7bd22beb06ab5e5e4f05f5
2012-09-25 09:31:15 -07:00
Jean-Baptiste Queru
fd5be7087b Merge into jb-mr1-dev
Change-Id: Ic10d3201218c7045e03e563996ac04239c75b52c
2012-09-25 09:29:56 -07:00
Jean-Baptiste Queru
0de06b7e19 Merge into jb-mr1-dev
Change-Id: I02a0c4a7c8f66c52631f962e097c28f6a41d7a64
2012-09-25 09:29:18 -07:00
Jean-Baptiste Queru
c68accd35e Merge into jb-mr1-dev
Change-Id: Icd17d762c9d8e96ea6b78b18fa8f66471bc694ae
2012-09-25 09:28:32 -07:00
Jean-Baptiste Queru
ca94050705 Merge into jb-mr1-dev
Change-Id: I5a9970a011de789aaeb1c4c4ed58ae750071b135
2012-09-25 09:27:45 -07:00
Jean-Baptiste Queru
93fd0f7a83 Merge into jb-mr1-dev
Change-Id: I6bfc2726c0c259eeb3caf13e1cee395324cac4c3
2012-09-25 09:27:02 -07:00
Jean-Baptiste Queru
908a43234a Merge into jb-mr1-dev
Change-Id: I7b777c7a4818d699582419d2eb4fc1f5cc0f4f46
2012-09-25 09:26:09 -07:00
Jean-Baptiste Queru
6fb2514cdf Merge into jb-mr1-dev
Change-Id: I1baab28b12364213673ed7992207ad198491f286
2012-09-25 09:25:15 -07:00
Martijn Coenen
8f862ef9f7 Add NfcBarcode technology API.
Supporting only Kovio barcode technology for now.

Bug: 7222958
Change-Id: I63976da2db16b0a5d9ec746f1a0e83833e74e5a9
2012-09-25 09:22:16 -07:00
Jason Sams
85d4955a13 Add test for copy kernels.
bug 7224526

Change-Id: I76e1e63b6bd53d84df9c60a61e6588b21f33c2e3
2012-09-24 17:27:59 -07:00
Romain Guy
4c7dc4aa5c Add extra error check when eglCreateContext fails
Bug #7216919

Change-Id: I322cbe4579d7a4eb2a64d288175e145d0badc857
2012-09-24 15:35:33 -07:00
Michael Jurka
7ae188335e Merge "Fix build" into jb-mr1-dev 2012-09-24 14:57:15 -07:00
Michael Jurka
0988524683 Fix build
Change-Id: I476664d9c0116fb4b135d443dd36ee7ebe3c25f4
2012-09-24 14:42:01 -07:00
Adam Powell
9ceac5a02f TaskStackBuilder and intents without an explicit target
When Activity#getParentActivityIntent() returns an Intent without an
explicit target, resolve it in order to determine a correct parent
stack.

Bug 7223318

Change-Id: I3e88129f1e538cc3d932d6b4f735a5bec54bb4ad
2012-09-24 14:28:44 -07:00
Jason Sams
816153b0b2 Merge "Test image for 2 input tests." into jb-mr1-dev 2012-09-24 14:25:21 -07:00
Dianne Hackborn
139748fd72 Fix issue #7215984: java.lang.RuntimeException: Unable to create...
...service com.android.systemui.SystemUIService: java.lang.NullPointerException

- Don't acquire the activity manager lock in handleIncomingUser(),
  there is really no need to do so.
- Rework the settings provider client side cache code to not hold
  locks while calling into the provider.

I also changed the way the settings provider uses system properties
so that there is one property for all users.  We can't do one per
user, since the system property name space is limited with a fixed
size.  And we don't really need to do that; the worse that happens
by combining all users is that if one running user changes one of its
settings, all other running users will think they need to reload
settings when they go to fetch them next.

Change-Id: I13b90b832310d117eb6d721aacd122cfba7d749a
2012-09-24 14:15:14 -07:00
Svetoslav Ganov
270a331cae Merge "UI test automation service should not be auto reconnected." into jb-mr1-dev 2012-09-24 13:58:22 -07:00
Svetoslav Ganov
657968a65f UI test automation service should not be auto reconnected.
1. Since adb is restarted on user switch it makes no sense to
   try to reconnect the ui automation service since it will
   be killed on a user switch.

   Disabling touch exploration on UI automation service
   connect since it can explicitly put the device in this
   state if needed.

bug:6967373

Change-Id: I8cfde74f28f3f03d4ccf24746d43b8178ae2b5ef
2012-09-24 13:50:44 -07:00
Daniel Sandler
598cfcad42 Merge "Properly launch quicksettings activities." into jb-mr1-dev 2012-09-24 13:42:36 -07:00
Sara Ting
4d6f90ea50 Adding support for new 'uid2445' column in Calendar's Events table.
Bug:7029852
Change-Id: I4fdf86ba44f5c7bdcc55e8c2bdf664dddbe671f5
2012-09-24 13:09:35 -07:00
Bart Sears
4249be40bd Merge "Updated versions of DroidSansFallback" into jb-mr1-dev 2012-09-24 13:06:37 -07:00
Jason Sams
c4b95cfc7b Test image for 2 input tests.
bug 7216044

Change-Id: I79794c1b12f618d03b27b316126cab9b3e4c9c38
2012-09-24 12:54:46 -07:00
Siva Velusamy
a850f9a168 Merge "Do not preload videoeditor_jni since it breaks the emulator" into jb-mr1-dev 2012-09-24 12:46:15 -07:00
Eino-Ville Talvala
487acdfb4e Camera: Improve enableShutterSound documentation.
Bug: 7216272
Change-Id: I1b9add715c7d3671472b9f98d9b1d80823109365
2012-09-24 12:22:16 -07:00
Romain Guy
87e2f757be Add a property to disable libhwui's scissor optimization
Bug #7158326

When scissor optimization is enabled, OpenGLRenderer will attempt to
minimize the use of scissor by selectively enabling and disabling the
GL scissor test.
When the optimization is disabled, OpenGLRenderer will keep the GL
scissor test enabled and change the scissor rect as needed.
Some GPUs (for instance the SGX 540) perform better when changing
the scissor rect often than when enabling/disabling the scissor test
often.

Change-Id: Idb68862e287a23358f9188d577ae0f86161902fd
2012-09-24 11:47:52 -07:00
Philip Milne
bc391d58c8 Merge "Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()"" into jb-mr1-dev 2012-09-24 11:41:53 -07:00
Philip Milne
53fe756772 Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()"
This reverts commit 2f6d8829524dfca3a77e9a57c3b9c3862209877d

Change-Id: Id5af767a09fc319127c4ebef837c5b7a7f75cb01
2012-09-24 11:38:29 -07:00
Michael Jurka
9b93f4def1 Merge "Fix security check for private allocateAppWidgetId api" into jb-mr1-dev 2012-09-24 11:24:26 -07:00
Dianne Hackborn
7451f15e74 Merge "Fix issue #6926562: Ensure all multi-user cache files are managed correctly" into jb-mr1-dev 2012-09-24 11:07:26 -07:00
Dianne Hackborn
556b09e184 Fix issue #6926562: Ensure all multi-user cache files are managed correctly
Now we correctly iterate through the different user cache dirs.

Also update documentation to describe the new cache pruning behavior,
and deprecate the file modes for making files world readable/writable
which we really don't want people using any more.

Change-Id: I3708df3ddc697b1f5c511143cce7cc40a5a3d0bd
2012-09-24 11:02:45 -07:00
Philip Milne
b00df8e929 Merge "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev 2012-09-24 11:02:31 -07:00
Dianne Hackborn
cd11b223f3 Merge "Fix issue #7214090: Need to be able to post notifications to all users" into jb-mr1-dev 2012-09-24 10:58:20 -07:00
Dianne Hackborn
50cdf7c306 Fix issue #7214090: Need to be able to post notifications to all users
Also fix a bunch of system services that should be doing this.  And
while doing that, found I needed to fix PendingIntent to evaluate
USER_CURRENT at the point of sending, not creation.

Note that this may end up with us having some notification shown to
non-primary users that lead to settings UI that should only be for
the primary user (such as the vpn notification).  I'm not sure what
to do about this, maybe we need a different UI to come up there or
something, but showing the actual notification for those users at
least seems less broken than not telling them at all.

Change-Id: Iffc51e2d7c847e3d05064d292ab93937646a1ab7
2012-09-24 10:55:46 -07:00
Siva Velusamy
c0373dfdc1 Do not preload videoeditor_jni since it breaks the emulator
Video editing is not supported on the emulator, so preloading
this causes the emulator to crash while booting up.

Bug 7200384

Change-Id: I1915d888be328c20aa66ca2318722d5b6e6342b0
2012-09-24 10:34:42 -07:00
Robert Greenwalt
d5111f252b Merge "Fix the build." into jb-mr1-dev 2012-09-24 10:13:57 -07:00
Robert Greenwalt
026efcc0b8 Fix the build.
Other side of change 229425: add the secure settings used to control
the source country used in premium-sms determination.

bug:7205426
Change-Id: I6c8fece4fdea9aeae72da70c5cbe45807197c7bc
2012-09-24 10:03:21 -07:00
Alon Albert
fcf0061ebf Merge "Skip operations for users who are not running" into jb-mr1-dev 2012-09-24 09:53:33 -07:00
Alon Albert
0ff6537568 Merge "Add columns to CalendarContract" into jb-mr1-dev 2012-09-24 09:46:59 -07:00
Amith Yamasani
888eb73c6e resolved conflicts for merge of 814f5ac3 to jb-mr1-dev
Change-Id: Ic65395ce932971dc9c37a481aa96da79a45d0f12
2012-09-24 09:26:37 -07:00
Victoria Lease
8658e1aa1f Merge "Allow apps to getProviders() without location permissions." into jb-mr1-dev 2012-09-24 09:02:13 -07:00
Amith Yamasani
814f5ac3a1 am b079d1f2: am 5e8cbdc0: Merge "Fixing services start order that impacts ICS - JB upgrade"
* commit 'b079d1f28089ad4de05162b7df0ace90bc40a5f3':
  Fixing services start order that impacts ICS - JB upgrade
2012-09-24 08:49:47 -07:00
The Android Open Source Project
18fd992b2d am a07cbb96: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit 'a07cbb96f34198b6cfda05d39a02c9220a9722cf':
  Show plmn in emergency call allowed mode.
  Get your own cursor Drawables, WebViewClassic!
2012-09-24 08:45:15 -07:00
Amith Yamasani
b079d1f280 am 5e8cbdc0: Merge "Fixing services start order that impacts ICS - JB upgrade"
* commit '5e8cbdc0bd6dfc51e6b54db1d5fd61347336d862':
  Fixing services start order that impacts ICS - JB upgrade
2012-09-24 08:45:14 -07:00
Kenny Root
c6f8a9985b Merge "LockScreen: don't update KeyStore password on unlock" into jb-mr1-dev 2012-09-24 08:43:34 -07:00
The Android Open Source Project
a07cbb96f3 Reconcile with jb-mr0-release - do not merge
Change-Id: Ic8d0d91f79b5766b639695d8769e386958706e34
2012-09-24 07:39:06 -07:00
John Spurlock
2ce1ae8e63 Merge "Migrate away from lightsOut() in BeanBagDream." into jb-mr1-dev 2012-09-24 05:52:46 -07:00
Bart Sears
562c45cc84 Updated versions of DroidSansFallback
Latest versions of DroidSansFallback from Monotype.

The DroidSansFallback.ttf file has some additional glyphs and
glyph fixes (including a fix for bug 6723057 and will likely fix
bug 6629748).  It continues to cover Korean Hangul but does not
cover CJK Ext A (for space reasons on small system image devices).
The DroidSansFallbackFull.ttf file has the bug fixes listed and
also removes the Korean Hangul because we are now going to use
NanumGothic for Korean (NanumGothic.ttf is added in a separate
CL in the external/naver-fonts directory).

The falback_fonts.xml file has been modified to add NanumGothic.ttf
before DroidSansFallback.

Bug: 4531601
Bug: 6723057
Bug: 6629748
Change-Id: I670d33078b4a97c4eda00fc2323be187696e927a
2012-09-24 00:32:57 -07:00