Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,772 Commits 3 Branches 0 Tags
dd6d7841fd8e4a8211ca44641d3e4677136f685e
Commit Graph

25735 Commits

Author SHA1 Message Date
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
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
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
Eino-Ville Talvala
487acdfb4e Camera: Improve enableShutterSound documentation. 
Bug: 7216272
Change-Id: I1b9add715c7d3671472b9f98d9b1d80823109365
 2012-09-24 12:22:16 -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 2f6d882952

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
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
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
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
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