drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,834 Commits 1 Branch 0 Tags
Commit Graph

35150 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Alon Albert
0ff6537568 Merge "Add columns to CalendarContract" into jb-mr1-dev 2012-09-24 09:46:59 -07:00
Jim Miller
fa3b11643b am fc74a44f: am 26c5686b: Merge "Better handling of multiple touch events in GlowPadView" into jb-mr1-dev 
* commit 'fc74a44f3e2df846fb009fe326809ed76537265b':
  Better handling of multiple touch events in GlowPadView
 2012-09-24 09:39:30 -07:00
Jeff Sharkey
dab41705e0 am 17505666: am 49397ac9: Merge "Always bind to DefaultContainerService as OWNER." into jb-mr1-dev 
* commit '175056661d1ec5219a6aec157544e510b9a47203':
  Always bind to DefaultContainerService as OWNER.
 2012-09-24 09:39:26 -07:00
Fabrice Di Meglio
793d9abb89 am c86c9fc0: am f7a3e979: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit 'c86c9fc092280cb961bf46e87050da9c46836278':
  Fix bug #6427629 Clean up layout direction APIs
 2012-09-24 09:39:15 -07:00
Fabrice Di Meglio
c60a19e368 am 402bab75: am be4c5dd9: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit '402bab75c360fd038910b3baedff54a1f4762c3d':
  Fix bug #6427629 Clean up layout direction APIs
 2012-09-24 09:39:07 -07:00
Fabrice Di Meglio
525926078b am 72d65718: am 239e4305: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit '72d657182312c7bac049b3ed94a4658c3935ae28':
  Fix bug #6427629 Clean up layout direction APIs
 2012-09-24 09:38:51 -07:00
Fabrice Di Meglio
42f11c981c am c81a319f: am e3f2ac9e: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit 'c81a319f1a2834590f1b7e5cfed0bbdba49d0838':
  Fix bug #6427629 Clean up layout direction APIs
 2012-09-24 09:38:43 -07:00
Dianne Hackborn
749bbe97ee am 55fd212f: am c0e1f268: Merge "Fix issue #7184877: Calendar Locksceen Widget crashes and forces phone to reboot" into jb-mr1-dev 
* commit '55fd212f914a28d0a64202a09f0127fa0a1b4175':
  Fix issue #7184877: Calendar Locksceen Widget crashes and forces phone to reboot
 2012-09-24 09:38:36 -07:00
Jeff Sharkey
5c7527ba15 am 8bc3cfa3: am 11820f73: Merge "Allow acquiring ContentProviders across users." into jb-mr1-dev 
* commit '8bc3cfa3674217e967b64340bae6f6003f332e66':
  Allow acquiring ContentProviders across users.
 2012-09-24 09:38:27 -07:00
Dianne Hackborn
eeb8f97993 am 2552e78a: am b939e352: Merge "Fix issue #7209355, #7214271." into jb-mr1-dev 
* commit '2552e78a15d2a88dd0e885ebf9490f8f38d9a393':
  Fix issue #7209355, #7214271.
 2012-09-24 09:38:23 -07:00
Brian Carlstrom
f0c6728ad4 am e3089736: am 5a009dcc: Merge "Add SSLCertificateSocketFactory.setSoWriteTimeout to allow SO_SNDTIMEO to be specified" into jb-mr1-dev 
* commit 'e308973644d40887a07fe2e31a74c0697b31dedf':
  Add SSLCertificateSocketFactory.setSoWriteTimeout to allow SO_SNDTIMEO to be specified
 2012-09-24 09:38:16 -07:00
Adam Powell
5210aa3f58 am 140c78f7: am bda527ec: Merge "Further tweak config_minScalingSpan for large screen devices" into jb-mr1-dev 
* commit '140c78f77c5a611953168fdac4dd122d16610494':
  Further tweak config_minScalingSpan for large screen devices
 2012-09-24 09:38:12 -07:00
Fabrice Di Meglio
54f49d8fa1 am 443e3f0b: am 57d863c3: Merge "Fix the build" into jb-mr1-dev 
* commit '443e3f0b7e9025234e02396561b9a9f798c38d60':
  Fix the build
 2012-09-24 09:38:09 -07:00
Fabrice Di Meglio
63e080904d am a478de98: am 415f26b7: Merge "Fix bug #7205589 CalendarView\'s WeekView rows are LTR in RTL locales" into jb-mr1-dev 
* commit 'a478de98a3314df864373f291faa45362dda71bc':
  Fix bug #7205589 CalendarView's WeekView rows are LTR in RTL locales
 2012-09-24 09:38:05 -07:00
Fabrice Di Meglio
b59cddbaac am e477ff0c: am 5c2591e6: Merge "Fix bug #7206086 NumberPicker widget should use locale digits" into jb-mr1-dev 
* commit 'e477ff0cde13de7996eb79fa2352cbfa3a3c5b75':
  Fix bug #7206086 NumberPicker widget should use locale digits
 2012-09-24 09:38:01 -07:00
Eino-Ville Talvala
19a58d2021 am 899d1efa: am a91c9f9f: Merge "Unhide and document feature android.hardware.camera.any." into jb-mr1-dev 
* commit '899d1efa4e83e1e01e885f30450380996bbe69fc':
  Unhide and document feature android.hardware.camera.any.
 2012-09-24 09:37:54 -07:00
Wu-cheng Li
802fcef997 am 9058a265: am 29f5230d: Merge "Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE" into jb-mr1-dev 
* commit '9058a26588be24a54b7c6e4cf1ac71fc53901148':
  Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE
 2012-09-24 09:37:46 -07:00
Romain Guy
d2926e4a25 am 454f2be1: am 8e586f61: Merge "Add support for a new developer setting: overdraw debugging" into jb-mr1-dev 
* commit '454f2be11f028b49d28154103996a3e71e935272':
  Add support for a new developer setting: overdraw debugging
 2012-09-24 09:37:34 -07:00
Amith Yamasani
bd565c3ce5 am 56be4dd8: am 77e95d3d: Merge "Show lockscreen widgets for the current user." into jb-mr1-dev 
* commit '56be4dd85f09c6f0bfdc1108c513569363013013':
  Show lockscreen widgets for the current user.
 2012-09-24 09:37:20 -07:00