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

4383 Commits

Author SHA1 Message Date
Brian Carlstrom
a1b0baf1e5 am df44266d: am 5e21bf93: Unhide SSLCertificateSocketFactory.setSoWriteTimeout 
* commit 'df44266daa8e50e2a0686bf3fc49454518eabb0f':
  Unhide SSLCertificateSocketFactory.setSoWriteTimeout
 2012-09-25 13:29:44 -07:00
Brian Carlstrom
5e21bf934b Unhide SSLCertificateSocketFactory.setSoWriteTimeout 
Bug: 6693087
Change-Id: I585c2a61226da58077fd7cd7826695ce17380248
 2012-09-25 10:38:52 -07:00
Jean-Baptiste Queru
5ef9cb68c3 Merge into jb-mr1-dev 
Change-Id: I4696f4336d79ca199f2358bfb3ed5fc7e6c51732
 2012-09-25 09:46:23 -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
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
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
Philip Milne
8c549d6ffe Merge "Bug #6110465. Optical bounds support for all ViewGroup subclasses." 2012-09-24 20:55:00 -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
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
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
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
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
0ff6537568 Merge "Add columns to CalendarContract" into jb-mr1-dev 2012-09-24 09:46:59 -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
Wink Saville
e9417314bd am 30f24dc8: am 8a06969d: Merge "Refactor Cell Location public API." into jb-mr1-dev 
* commit '30f24dc835b1758c7f86bde8ceeb4ff3523fe037':
  Refactor Cell Location public API.
 2012-09-24 09:39:00 -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
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
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
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
Jason Sams
ebe3bc596b am 260b7214: am 7b3132d9: Merge "Add Blend intrinsic." into jb-mr1-dev 
* commit '260b72148e037c63b2c3984e6adf6aab052c2394':
  Add Blend intrinsic.
 2012-09-24 00:51:41 -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
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
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
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
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
Wink Saville
8a06969d5b Merge "Refactor Cell Location public API." into jb-mr1-dev 2012-09-23 15:44:30 -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
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
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
Adam Cohen
8562cb5982 Merge "Changing public method to @hide, doesn't have to be public" into jb-mr1-dev 2012-09-21 16:56:31 -07:00