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
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
Eino-Ville Talvala
d2ac940117
am 35f0ee64: am c9108b18: Merge "Add hardware feature android.hardware.camera.any." into jb-mr1-dev
...
* commit '35f0ee64899f265eebddf75a31be3b3187529c72':
Add hardware feature android.hardware.camera.any.
2012-09-24 09:37:08 -07:00
Jim Miller
d7aa6110f1
am 99b0d436: am 6eeff850: Merge "Remove UID checks from LockPatternUtils" into jb-mr1-dev
...
* commit '99b0d43645afb2dfd81e1c2ea080de7199fae239':
Remove UID checks from LockPatternUtils
2012-09-24 09:37:04 -07:00
Svetoslav Ganov
412201a944
am 631b6380: am 0a5c5567: Merge "Multi-user support for the accessibility layer." into jb-mr1-dev
...
* commit '631b63804e448d5a29e4089a1ad1804cf0279480':
Multi-user support for the accessibility layer.
2012-09-24 00:52:23 -07:00
Adam Cohen
abe60e41c4
am d6a766ab: am 172cb769: Merge "Fixing onRestoreInstanceState crash in Launcher" into jb-mr1-dev
...
* commit 'd6a766abaf2abfaf4e8fde9f80ee226d71cf1b09':
Fixing onRestoreInstanceState crash in Launcher
2012-09-24 00:52:13 -07:00
Dianne Hackborn
19a22ced89
am 033e60e8: am c9e94ea6: Merge "Fix issue #7213113 : Remove old intent resolver" into jb-mr1-dev
...
* commit '033e60e87aa5c704caf8d00b30b323dd126c4151':
Fix issue #7213113 : Remove old intent resolver
2012-09-24 00:52:09 -07:00
Adam Cohen
c328f7f8f6
am dce17917: am 8562cb59: Merge "Changing public method to @hide, doesn\'t have to be public" into jb-mr1-dev
...
* commit 'dce17917103d25e18063a7d71e592e131f8e0bd3':
Changing public method to @hide, doesn't have to be public
2012-09-24 00:52:02 -07:00
Svetoslav Ganov
dddf962f1c
am a586a3c9: am 38533ea5: Merge "NPE in AcitivtyChooserModel." into jb-mr1-dev
...
* commit 'a586a3c9a7d2e317b8b5025faa77f088aed38fd4':
NPE in AcitivtyChooserModel.
2012-09-24 00:51:56 -07:00
Svetoslav Ganov
c250400901
am 03037841: am 08681add: Merge "Day numbers in CalendarView have incorrect size." into jb-mr1-dev
...
* commit '03037841d4ccce4382ccbf55eddd96c427eb5861':
Day numbers in CalendarView have incorrect size.
2012-09-24 00:51:48 -07:00
Victoria Lease
c5d684a5ee
am 15edd2d5: am b77b3cfe: Merge "Get your own cursor Drawables, WebViewClassic!" into jb-mr1-dev
...
* commit '15edd2d5ad8ba17e183b5f1222ef39150df38397':
Get your own cursor Drawables, WebViewClassic!
2012-09-24 00:51:44 -07:00
Eino-Ville Talvala
5d0c5079ce
am eace371e: am 5ce25d71: Merge "NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound" into jb-mr1-dev
...
* commit 'eace371ee01f8e61731d86110ec84258994eeded':
NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound
2012-09-24 00:51:20 -07:00
Jeff Brown
d571122db5
am 1022a785: am 3ca59713: Merge "Support HDMI hotplug." into jb-mr1-dev
...
* commit '1022a785e52384dc8503127df1ceaababcd88a1a':
Support HDMI hotplug.
2012-09-24 00:51:06 -07:00
Jim Miller
0b0c0efabf
am 998f94c9: am 1ed9fa10: Merge "Make DPM API for disabling keyguard widgets more generic" into jb-mr1-dev
...
* commit '998f94c96afee8d3c76dcaf64f3f23dfdf8d8ce5':
Make DPM API for disabling keyguard widgets more generic
2012-09-24 00:50:28 -07:00
rich cannings
0f2714414a
am 83abadb0: am 04c2bb86: Merge "Add setting to skip verifying ADB installs" into jb-mr1-dev
...
* commit '83abadb06a21ba54df6cc8a5c1f3c48253488430':
Add setting to skip verifying ADB installs
2012-09-24 00:49:36 -07:00
Daniel Sandler
3cfe94e792
am 89add82a: am df655d09: Merge "Fix javadocs to fix build." into jb-mr1-dev
...
* commit '89add82aa63af50cf407ff746baf92bd37336e02':
Fix javadocs to fix build.
2012-09-24 00:48:58 -07:00
John Spurlock
37a16ee466
am b8016f7a: am 22505501: Merge "Additions to Dream public api." into jb-mr1-dev
...
* commit 'b8016f7acecf8ff43b98c0285c7d9910577934aa':
Additions to Dream public api.
2012-09-24 00:48:48 -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
Dianne Hackborn
b939e35274
Merge "Fix issue #7209355 , #7214271." into jb-mr1-dev
2012-09-23 12:58:10 -07:00
Dianne Hackborn
8da429e80d
Fix issue #7209355 , #7214271 .
...
Issue #7209355 : Intent on the secondary user results in an intent picker
in the Primary user.
Issue #7214271 : Crash in system UI
Also fix a bug where I recently broke the removeTask() operation in the
activity manager where it would remove the wrong task.
Change-Id: I448c73a0e83a78d9d8d96b4629658c169888d275
2012-09-23 12:53:34 -07:00
Brian Carlstrom
5a009dcc58
Merge "Add SSLCertificateSocketFactory.setSoWriteTimeout to allow SO_SNDTIMEO to be specified" into jb-mr1-dev
2012-09-23 12:25:31 -07:00
Fabrice Di Meglio
57d863c3c2
Merge "Fix the build" into jb-mr1-dev
2012-09-23 12:00:03 -07:00
Fabrice Di Meglio
a65fe884d1
Fix the build
...
Change-Id: Ia021742fb33671f9ece48180789757297fa60001
2012-09-23 11:54:51 -07:00
Fabrice Di Meglio
415f26b73c
Merge "Fix bug #7205589 CalendarView's WeekView rows are LTR in RTL locales" into jb-mr1-dev
2012-09-23 11:11:52 -07:00
Fabrice Di Meglio
5c2591e6ef
Merge "Fix bug #7206086 NumberPicker widget should use locale digits" into jb-mr1-dev
2012-09-23 11:10:40 -07:00
Eino-Ville Talvala
a91c9f9f7a
Merge "Unhide and document feature android.hardware.camera.any." into jb-mr1-dev
2012-09-23 10:14:22 -07:00
Wu-cheng Li
29f5230dc6
Merge "Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE" into jb-mr1-dev
2012-09-23 02:21:17 -07:00
Jeff Sharkey
6d51571835
Allow acquiring ContentProviders across users.
...
Otherwise services like SystemUI will always open content://-style
Uris as USER_OWNER. Surfaces through createPackageContextAsUser()
which points all ContentResolver operations towards a given user.
Start using in RemoteViews, so that Notifications correctly resolve
image Uris to the sending user. Also add user support for "content"
shell tool.
Bug: 7202982
Change-Id: I8cb7fb8a812e825bb0b5833799dba87055ff8699
2012-09-21 19:49:43 -07:00
Romain Guy
8e586f61dd
Merge "Add support for a new developer setting: overdraw debugging" into jb-mr1-dev
2012-09-21 19:28:06 -07:00
Romain Guy
7c450aaa3c
Add support for a new developer setting: overdraw debugging
...
Change-Id: I350ba4486577c3289f82c20938f7a35138778727
2012-09-21 19:15:00 -07:00
Fabrice Di Meglio
550ea7f546
Fix bug #7205589 CalendarView's WeekView rows are LTR in RTL locales
...
Change-Id: Iacd1718be054b4405ea0c769f695044faf4254b6
2012-09-21 18:54:53 -07:00
Fabrice Di Meglio
d88e3054d0
Fix bug #7206086 NumberPicker widget should use locale digits
...
- fix for having the TwoDigitFormatter being able to be recreated if the locale is changed
- accept now also the Arabic and Persian digits
Change-Id: Ifbf7e274d971008f4a5782402d4b76d9472b68fc
2012-09-21 18:42:47 -07:00
Amith Yamasani
77e95d3d71
Merge "Show lockscreen widgets for the current user." into jb-mr1-dev
2012-09-21 18:16:49 -07:00
Amith Yamasani
8fd96ec2dc
Show lockscreen widgets for the current user.
...
Also shows the owner info and next alarm for the current user.
AppWidgetService now assumes that any widgets running in the system process are for the
current user, so that lockscreen shows widgets for the current user
Bug: 7211754
Bug: 7212421
Change-Id: Iaf0edc60e49af0afe42625c0b2dcf100c9ecc178
2012-09-21 18:10:34 -07:00
Eino-Ville Talvala
c9108b1856
Merge "Add hardware feature android.hardware.camera.any." into jb-mr1-dev
2012-09-21 17:57:03 -07:00
Jim Miller
6eeff850b2
Merge "Remove UID checks from LockPatternUtils" into jb-mr1-dev
2012-09-21 17:31:09 -07:00
Svetoslav Ganov
0a5c5567f2
Merge "Multi-user support for the accessibility layer." into jb-mr1-dev
2012-09-21 17:21:45 -07:00
Adam Cohen
172cb76964
Merge "Fixing onRestoreInstanceState crash in Launcher" into jb-mr1-dev
2012-09-21 17:11:38 -07:00
Dianne Hackborn
c9e94ea645
Merge "Fix issue #7213113 : Remove old intent resolver" into jb-mr1-dev
2012-09-21 17:05:47 -07:00