Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,574 Commits 3 Branches 0 Tags
df3131e466157ae5a38174c985fa514f03e1fcf4
Commit Graph

27543 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
df3131e466 am 6fb2514c: Merge into jb-mr1-dev 
* commit '6fb2514cdf77e2657d7b73b0cd97e060aefc6b53':
  Fix issue #7215984: java.lang.RuntimeException: Unable to create...
 2012-09-25 12:46:26 -07:00
Martijn Coenen
8aad9d7923 am 8f862ef9: Add NfcBarcode technology API. 
* commit '8f862ef9f74f2d2ebf767c645ce39db8412dd08f':
  Add NfcBarcode technology API.
 2012-09-25 12:46:22 -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
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
Philip Milne
0014c0f64a am bc391d58: Merge "Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()"" into jb-mr1-dev 
* commit 'bc391d58c8d09bd58b57dda20dd9d2281d90db32':
  Revert "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()"
 2012-09-24 11:43:42 -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
308ac6c6e4 am 7451f15e: Merge "Fix issue #6926562: Ensure all multi-user cache files are managed correctly" into jb-mr1-dev 
* commit '7451f15e7464fe8dd117b74c6dcff780785e0007':
  Fix issue #6926562: Ensure all multi-user cache files are managed correctly
 2012-09-24 11:08:46 -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
Philip Milne
2eba91d98f am b00df8e9: Merge "Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()" into jb-mr1-dev 
* commit 'b00df8e929f9ba865a95a7df3f949e6169332954':
  Fix for bug: #7173350. elapsedRealtimeNano() -> elapsedRealtimeNanos()
 2012-09-24 11:05:19 -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
dae9f15389 am cd11b223: Merge "Fix issue #7214090: Need to be able to post notifications to all users" into jb-mr1-dev 
* commit 'cd11b223f3d23ca0f92b53808f7e1cce928c2a7b':
  Fix issue #7214090: Need to be able to post notifications to all users
 2012-09-24 11:00:57 -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
e7dc94e37c am d5111f25: Merge "Fix the build." into jb-mr1-dev 
* commit 'd5111f252b731396293caedbee929856acd6b276':
  Fix the build.
 2012-09-24 10:16:46 -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
3b086c921a am fcf0061e: Merge "Skip operations for users who are not running" into jb-mr1-dev 
* commit 'fcf0061ebf2a56f76f207460b39fb14f25779bfd':
  Skip operations for users who are not running
 2012-09-24 09:56:08 -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
d4b191562d am 0ff65375: Merge "Add columns to CalendarContract" into jb-mr1-dev 
* commit '0ff65375683f5d5f05c7e1882f758cc93be57c99':
  Add columns to CalendarContract
 2012-09-24 09:50:10 -07:00
Alon Albert
0ff6537568 Merge "Add columns to CalendarContract" into jb-mr1-dev 2012-09-24 09:46:59 -07:00
Jim Miller
fdf326f18c am 26c5686b: Merge "Better handling of multiple touch events in GlowPadView" into jb-mr1-dev 
* commit '26c5686b7e3bf0ba238c55caa3e86447bab7cc61':
  Better handling of multiple touch events in GlowPadView
 2012-09-24 08:48:23 -07:00
Jeff Sharkey
63001c679c am 49397ac9: Merge "Always bind to DefaultContainerService as OWNER." into jb-mr1-dev 
* commit '49397ac93ce3cf4fc38d00b1099a6cd9075cee8a':
  Always bind to DefaultContainerService as OWNER.
 2012-09-24 08:48:19 -07:00
Fabrice Di Meglio
d865a54841 am f7a3e979: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit 'f7a3e979a7ab3be4715408b6328f27e56a7c9326':
  Fix bug #6427629 Clean up layout direction APIs
 2012-09-24 08:48:06 -07:00
Fabrice Di Meglio
3e276b9966 am be4c5dd9: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit 'be4c5dd9d0b3ec1e020431f0e618a4cf38f9c57d':
  Fix bug #6427629 Clean up layout direction APIs
 2012-09-24 08:47:57 -07:00
Fabrice Di Meglio
8f3ba9fa1b am 239e4305: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit '239e430578fd2d3bd38a646595a82bca95359bd7':
  Fix bug #6427629 Clean up layout direction APIs
 2012-09-24 08:47:42 -07:00
Fabrice Di Meglio
16c84db706 am e3f2ac9e: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit 'e3f2ac9e526e5b4de4d2ae113e644c1cb14b1ce6':
  Fix bug #6427629 Clean up layout direction APIs
 2012-09-24 08:47:35 -07:00
Dianne Hackborn
a611a53292 am c0e1f268: Merge "Fix issue #7184877: Calendar Locksceen Widget crashes and forces phone to reboot" into jb-mr1-dev 
* commit 'c0e1f268451550368d1d3d3558f8ce2459ed5713':
  Fix issue #7184877: Calendar Locksceen Widget crashes and forces phone to reboot
 2012-09-24 08:47:28 -07:00
Jeff Sharkey
e2bb66f64c am 11820f73: Merge "Allow acquiring ContentProviders across users." into jb-mr1-dev 
* commit '11820f7386ce86fd89e9e6b49d9231dce6e1ed07':
  Allow acquiring ContentProviders across users.
 2012-09-24 08:47:17 -07:00
Dianne Hackborn
66c86dd38b am b939e352: Merge "Fix issue #7209355, #7214271." into jb-mr1-dev 
* commit 'b939e35274334d1f5e71a526efe8d235eb6d7387':
  Fix issue #7209355, #7214271.
 2012-09-24 08:47:13 -07:00
Brian Carlstrom
ea28e107c3 am 5a009dcc: Merge "Add SSLCertificateSocketFactory.setSoWriteTimeout to allow SO_SNDTIMEO to be specified" into jb-mr1-dev 
* commit '5a009dcc58a46c41f1b54ccffca7d1317bbbff18':
  Add SSLCertificateSocketFactory.setSoWriteTimeout to allow SO_SNDTIMEO to be specified
 2012-09-24 08:47:05 -07:00
Fabrice Di Meglio
2d03704c0f am 57d863c3: Merge "Fix the build" into jb-mr1-dev 
* commit '57d863c3c28e13ac299fda8ba30bf1d6644230c8':
  Fix the build
 2012-09-24 08:46:59 -07:00
Fabrice Di Meglio
4aadafb830 am 415f26b7: Merge "Fix bug #7205589 CalendarView\'s WeekView rows are LTR in RTL locales" into jb-mr1-dev 
* commit '415f26b73c90d07b9ec232ae4bd6bec59b28ddf8':
  Fix bug #7205589 CalendarView's WeekView rows are LTR in RTL locales
 2012-09-24 08:46:54 -07:00
Fabrice Di Meglio
4a3a6d11d0 am 5c2591e6: Merge "Fix bug #7206086 NumberPicker widget should use locale digits" into jb-mr1-dev 
* commit '5c2591e6eff3233c7f9c5bbae0dd20c1320f0854':
  Fix bug #7206086 NumberPicker widget should use locale digits
 2012-09-24 08:46:51 -07:00
Eino-Ville Talvala
2cd624d9d3 am a91c9f9f: Merge "Unhide and document feature android.hardware.camera.any." into jb-mr1-dev 
* commit 'a91c9f9f7a3c5d09333bdf27ef06012bb4e7d710':
  Unhide and document feature android.hardware.camera.any.
 2012-09-24 08:46:42 -07:00
Wu-cheng Li
4358c93892 am 29f5230d: Merge "Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE" into jb-mr1-dev 
* commit '29f5230dc604537a72842a70991bae71019f8c80':
  Unhide android.provider.MediaStore.ACTION_IMAGE_CAPTURE_SECURE
 2012-09-24 08:46:34 -07:00
Romain Guy
b29e4a20a5 am 8e586f61: Merge "Add support for a new developer setting: overdraw debugging" into jb-mr1-dev 
* commit '8e586f61dd4f7fa53b01e63ac779ffc7cde05bdd':
  Add support for a new developer setting: overdraw debugging
 2012-09-24 08:46:23 -07:00
Amith Yamasani
018824cab0 am 77e95d3d: Merge "Show lockscreen widgets for the current user." into jb-mr1-dev 
* commit '77e95d3d71f10a0d936445e3f3ed90e15c019024':
  Show lockscreen widgets for the current user.
 2012-09-24 08:46:08 -07:00
Eino-Ville Talvala
40279c0c28 am c9108b18: Merge "Add hardware feature android.hardware.camera.any." into jb-mr1-dev 
* commit 'c9108b1856c7b6d98ddc04fbe330df21f2da890d':
  Add hardware feature android.hardware.camera.any.
 2012-09-24 08:45:58 -07:00
Jim Miller
da2d69c1dc am 6eeff850: Merge "Remove UID checks from LockPatternUtils" into jb-mr1-dev 
* commit '6eeff850b245bd3be3a0e782cd9f28daadf922dc':
  Remove UID checks from LockPatternUtils
 2012-09-24 08:45:55 -07:00
Jim Miller
26c5686b7e Merge "Better handling of multiple touch events in GlowPadView" into jb-mr1-dev 2012-09-23 19:03:20 -07:00
Jeff Sharkey
49397ac93c Merge "Always bind to DefaultContainerService as OWNER." into jb-mr1-dev 2012-09-23 18:25:47 -07:00
Jim Miller
b499884ba1 Better handling of multiple touch events in GlowPadView 
This fixes a bug where a secondary touch event from the edge of the screen
would cause GlowPadView to choose the wrong target.  The issue is resolved
by keeping track of pointer ids and only allowing the one that initiated
the gesture to complete it.

Fixes bug 7133500

Change-Id: If296b60af2421bfa1a9a082e608ba77b2392a218
 2012-09-23 17:18:17 -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
Jeff Sharkey
752cd922f7 Always bind to DefaultContainerService as OWNER. 
When PackageManagerService deals with external storage, always bind
to DefaultContainerService as USER_OWNER.  This avoids binding to a
stopped user, which would fail.

Bug: 7203111
Change-Id: I8e303c7558e8b5cbe4fea0acc9a472b598df0caa
 2012-09-23 16:44:34 -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