34529 Commits

Author SHA1 Message Date
Romain Guy
ed1b6f4fc0 Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext
Bug #7216919

Change-Id: Ie4a855ee51a0a4fad69bae8f377189d0c653f543
2012-09-25 09:44:35 -07:00
Romain Guy
c002936e4b Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext
Bug #7216919

Change-Id: If2059227d55e8ddb2d2673ee36029c3c92dd9a3d
2012-09-25 09:43:23 -07:00
Jean-Baptiste Queru
7951c459ae Merge into jb-mr1-dev
Change-Id: Ifc2328e30a52c2baebc1322c9b161104dcf21618
2012-09-25 09:36:32 -07:00
Jean-Baptiste Queru
a5e1d21f56 Merge into jb-mr1-dev
Change-Id: I22fd779623397332e493f71ac718b972e1e1dad7
2012-09-25 09:35:53 -07:00
Jean-Baptiste Queru
ec1996131d Merge into jb-mr1-dev
Change-Id: I97ff2551b36a1b590f2d314cabfcf198dd10f404
2012-09-25 09:35:19 -07:00
Jean-Baptiste Queru
7a7c6aa0c3 Merge into jb-mr1-dev
Change-Id: I821410e9ffcc7148139465c04ef335f0becc18c2
2012-09-25 09:34:45 -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
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
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
Amith Yamasani
ea7e91514e AppInfo from Notifications for secondary users
Required wiring up startActivitiesAsUser()

Bug: 7224950

Also fix a bug in navigateUp in secondary user

Change-Id: I114ae2de0457362d62e899fdb94b12239a3eb778
2012-09-24 17:19:03 -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
Jeff Brown
8d0243a3d0 Fix surface view on secondary display.
Bug: 7183618
Change-Id: I8d743b5db8f362afb97f720846d990f9a722b3bd
2012-09-24 15:02:15 -07:00
Jeff Brown
efd43bdb83 Force activities to run on the second display for testing.
This is a simple hack for testing and development purposes.
It makes the framework place the main window of an activity
on to a secondary display instead of on the default display.

Set the "debug.second-display.pkg" to a substring of the
package name of the activity that you want to have show
up on the secondary display, such as "com.example.android.apis"

Bug: 7183618
Change-Id: I0a9e7f27c8ff253253b9de57d4bc49f31d95a0e2
2012-09-24 14:37:25 -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
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
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
Jeff Sharkey
7d8bcb498d Move multi-user OBB under user-specific path.
Bug: 7212801
Change-Id: I0ab83c1d9cb21914d61a7da45a32e89956e22ec8
2012-09-24 13:03:35 -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
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
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
Jim Miller
26c5686b7e Merge "Better handling of multiple touch events in GlowPadView" into jb-mr1-dev 2012-09-23 19:03:20 -07:00
Jeff Sharkey
49397ac93c Merge "Always bind to DefaultContainerService as OWNER." into jb-mr1-dev 2012-09-23 18:25:47 -07:00
Jim Miller
b499884ba1 Better handling of multiple touch events in GlowPadView
This fixes a bug where a secondary touch event from the edge of the screen
would cause GlowPadView to choose the wrong target.  The issue is resolved
by keeping track of pointer ids and only allowing the one that initiated
the gesture to complete it.

Fixes bug 7133500

Change-Id: If296b60af2421bfa1a9a082e608ba77b2392a218
2012-09-23 17:18:17 -07:00
Fabrice Di Meglio
f7a3e979a7 Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 2012-09-23 16:45:51 -07:00
Jeff Sharkey
752cd922f7 Always bind to DefaultContainerService as OWNER.
When PackageManagerService deals with external storage, always bind
to DefaultContainerService as USER_OWNER.  This avoids binding to a
stopped user, which would fail.

Bug: 7203111
Change-Id: I8e303c7558e8b5cbe4fea0acc9a472b598df0caa
2012-09-23 16:44:34 -07:00
Fabrice Di Meglio
1a7d487380 Fix bug #6427629 Clean up layout direction APIs
- rename getResolvedTextAlignment() to getTextAlignment()

Change-Id: I6a2b6c9ec4f5cea1adde46e35d5f3c49880791ee
2012-09-23 16:19:58 -07:00
Fabrice Di Meglio
be4c5dd9d0 Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 2012-09-23 16:19:03 -07:00
Fabrice Di Meglio
97e146cf02 Fix bug #6427629 Clean up layout direction APIs
- rename getResolvedTextDirection() to getTextDirection()

Change-Id: Id2a6025daf5521dcd676e454fc6bb9955fdccf2d
2012-09-23 15:55:11 -07:00
Fabrice Di Meglio
239e430578 Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 2012-09-23 15:09:56 -07:00
Fabrice Di Meglio
e3f2ac9e52 Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 2012-09-23 15:05:56 -07:00
Fabrice Di Meglio
e56ffdc7b3 Fix bug #6427629 Clean up layout direction APIs
- rename getResolvedLayoutDirection() to getLayoutDirection()

Change-Id: I3afe56c0db0751952f5056c23893cb7455531d29
2012-09-23 14:51:16 -07:00
Fabrice Di Meglio
4457e85a70 Fix bug #6427629 Clean up layout direction APIs
- canResolveXxx() should be hidden
- resetResolvedXxx() should be hidden
- resolveDrawables(), resolveLayoutDirection(), resolvePadding(), resolveTextAlignment(), resolveTextDirection() should be hidden
- onResolvedXxx() should be merged into one callback
- fix also an issue with setting the layout direction of the drawable in ImageView
- fix also an issue with checking if TextAlignment can be resolved

Change-Id: I1402269ddf8632525f5550f80e5610e1a7b4034d
2012-09-23 14:15:26 -07:00
Dianne Hackborn
c0e1f26845 Merge "Fix issue #7184877: Calendar Locksceen Widget crashes and forces phone to reboot" into jb-mr1-dev 2012-09-23 13:31:33 -07:00
Dianne Hackborn
3b84206bba Fix issue #7184877: Calendar Locksceen Widget crashes and forces phone to reboot
Don't kill the system uid if we are running out of RAM.

Change-Id: Ie1818a3241fc80d4dfa19f8e8bdad22d164d7baa
2012-09-23 13:29:44 -07:00
Jeff Sharkey
11820f7386 Merge "Allow acquiring ContentProviders across users." into jb-mr1-dev 2012-09-23 13:22:27 -07:00