35170 Commits

Author SHA1 Message Date
Kristian Monsen
7f37a5028f am 20d2bcf8: am 7ae8a60f: Merge "Hiding a method for JB-MR1" into jb-mr1-dev
* commit '20d2bcf899ece7a39dcf120bd9cfdfb235f6198f':
  Hiding a method for JB-MR1
2012-09-25 07:32:36 -07:00
Kristian Monsen
7ae8a60f35 Merge "Hiding a method for JB-MR1" into jb-mr1-dev 2012-09-25 07:29:13 -07:00
Baligh Uddin
1ae5a48d93 Merge "Import translations. DO NOT MERGE" 2012-09-25 07:12:29 -07:00
Ben Murdoch
06a1c6fe1c Merge "Expose resources needed by Chromium-WebView." 2012-09-25 02:31:09 -07:00
Romain Guy
0c3df4308d am d38bc618: am eea774a1: Merge "Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919" into jb-mr1-dev
* commit 'd38bc618bc0e55e52f0575f51f145dcfec1c983b':
  Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919
2012-09-24 21:49:42 -07:00
Romain Guy
eea774a1f6 Merge "Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919" into jb-mr1-dev 2012-09-24 21:45:13 -07:00
Romain Guy
bf3e77d46d Really Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext
Bug #7216919

Change-Id: Ie4a855ee51a0a4fad69bae8f377189d0c653f543
2012-09-24 21:42:18 -07:00
Philip Milne
8c549d6ffe Merge "Bug #6110465. Optical bounds support for all ViewGroup subclasses." 2012-09-24 20:55:00 -07:00
Romain Guy
eebe0267f4 Merge "Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext Bug #7216919" into jb-mr1-dev 2012-09-24 20:44:09 -07:00
Romain Guy
fb9e6cc275 Trigger the log when EGL_NO_CONTEXT is returned by eglCreateContext
Bug #7216919

Change-Id: If2059227d55e8ddb2d2673ee36029c3c92dd9a3d
2012-09-24 20:18:13 -07:00
Amith Yamasani
8d8766bc78 Merge "AppInfo from Notifications for secondary users" into jb-mr1-dev 2012-09-24 17:43:18 -07:00
Jeff Sharkey
7db28b3a4a Merge "Move multi-user OBB under user-specific path." into jb-mr1-dev 2012-09-24 17:42:16 -07:00
Jeff Brown
c5a2b1a6f3 Merge changes I8d743b5d,I4ef74691,I21ddb990 into jb-mr1-dev
* changes:
  Fix surface view on secondary display.
  Fix drag and drop surfaces on secondary displays.
  Allow a window on a secondary display to have focus.
2012-09-24 17:38:23 -07:00
Jeff Brown
3f24678f23 Merge "Force activities to run on the second display for testing." into jb-mr1-dev 2012-09-24 17:37:02 -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
Dianne Hackborn
e7075904e8 Merge "Fix build." into jb-mr1-dev 2012-09-24 16:48:30 -07:00
Martijn Coenen
ca0cf4ee78 Fix build.
Bug: 7222958
Change-Id: I2f9ff988f09be6cd4be49bfb90750a46e63c2c14
2012-09-24 16:39:19 -07:00
Kristian Monsen
d0b90d30d8 Hiding a method for JB-MR1
This one got left out in the last round of method hiding.

This got lost in the last round of method hiding.

Change-Id: I3c6aa234dd29933cb32d0cd91830d47289e7e639
2012-09-24 19:11:30 -04:00
Sara Ting
db8f10ad9a Merge "Adding support for new 'uid2445' column in Calendar's Events table." into jb-mr1-dev 2012-09-24 16:03:22 -07:00
Adam Powell
ff997bc950 Merge "TaskStackBuilder and intents without an explicit target" into jb-mr1-dev 2012-09-24 15:46:26 -07:00
Romain Guy
dd6d7841fd Merge "Add extra error check when eglCreateContext fails Bug #7216919" into jb-mr1-dev 2012-09-24 15:39:48 -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
Eino-Ville Talvala
f6103b6bfd Merge "Camera: Improve enableShutterSound documentation." into jb-mr1-dev 2012-09-24 15:31:21 -07:00
Romain Guy
da42438cf7 Merge "Add a property to disable libhwui's scissor optimization Bug #7158326" into jb-mr1-dev 2012-09-24 15:11:03 -07:00
Dianne Hackborn
4c0f678284 Merge "Fix issue #7215984: java.lang.RuntimeException: Unable to create..." into jb-mr1-dev 2012-09-24 15:08:31 -07:00
Jeff Brown
8d0243a3d0 Fix surface view on secondary display.
Bug: 7183618
Change-Id: I8d743b5db8f362afb97f720846d990f9a722b3bd
2012-09-24 15:02:15 -07:00
Martijn Coenen
ed50c00653 Merge "Add NfcBarcode technology API." into jb-mr1-dev 2012-09-24 15:01:20 -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
Martijn Coenen
0bec15ebed Add NfcBarcode technology API.
Supporting only Kovio barcode technology for now.

Bug: 7222958
Change-Id: I63976da2db16b0a5d9ec746f1a0e83833e74e5a9
2012-09-24 14:01:40 -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
Baligh Uddin
54323a12a9 Import translations. DO NOT MERGE
Change-Id: Iddcbfc1562bfe0136c7f51c59bee14d6782cb902
Auto-generated-cl: translation import
2012-09-24 13:09:22 -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
Ben Murdoch
4b36f6d180 Expose resources needed by Chromium-WebView.
This is the first set of framework resources that we've encountered
during the Chromium-WebView bring up that need to be exposed, so add
them to symbols.xml. There will likely be more to come as we continue
bring up work.

Bug: 7178701
Change-Id: I12571e5385bfc13213d2e3c7dfabfdc904c8fe84
2012-09-24 19:40:35 +01: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
2b24e06a06 am 940eb097: am d5111f25: Merge "Fix the build." into jb-mr1-dev
* commit '940eb097278ae70c721a347dc5eee8e34fdbf191':
  Fix the build.
2012-09-24 10:21:29 -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
f528e56de0 am 4f895c81: am fcf0061e: Merge "Skip operations for users who are not running" into jb-mr1-dev
* commit '4f895c8143eef5e6bdc1f3a74c74b09bc1437a14':
  Skip operations for users who are not running
2012-09-24 09:58:12 -07:00
Alon Albert
d5aa6bd073 am d1631f76: am 0ff65375: Merge "Add columns to CalendarContract" into jb-mr1-dev
* commit 'd1631f76b8e4797957cb85f4a8ce9926dd2c163b':
  Add columns to CalendarContract
2012-09-24 09:54:16 -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