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

87764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Jurka
7ae188335e Merge "Fix build" into jb-mr1-dev 2012-09-24 14:57:15 -07:00
Michael Jurka
0988524683 Fix build 
Change-Id: I476664d9c0116fb4b135d443dd36ee7ebe3c25f4
 2012-09-24 14:42:01 -07:00
Jason Sams
816153b0b2 Merge "Test image for 2 input tests." into jb-mr1-dev 2012-09-24 14:25:21 -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
Svetoslav Ganov
270a331cae Merge "UI test automation service should not be auto reconnected." into jb-mr1-dev 2012-09-24 13:58:22 -07:00
Svetoslav Ganov
657968a65f UI test automation service should not be auto reconnected. 
1. Since adb is restarted on user switch it makes no sense to
   try to reconnect the ui automation service since it will
   be killed on a user switch.

   Disabling touch exploration on UI automation service
   connect since it can explicitly put the device in this
   state if needed.

bug:6967373

Change-Id: I8cfde74f28f3f03d4ccf24746d43b8178ae2b5ef
 2012-09-24 13:50:44 -07:00
Daniel Sandler
598cfcad42 Merge "Properly launch quicksettings activities." into jb-mr1-dev 2012-09-24 13:42:36 -07:00
Bart Sears
4249be40bd Merge "Updated versions of DroidSansFallback" into jb-mr1-dev 2012-09-24 13:06:37 -07:00
Jason Sams
c4b95cfc7b Test image for 2 input tests. 
bug 7216044

Change-Id: I79794c1b12f618d03b27b316126cab9b3e4c9c38
 2012-09-24 12:54:46 -07:00
Siva Velusamy
a850f9a168 Merge "Do not preload videoeditor_jni since it breaks the emulator" into jb-mr1-dev 2012-09-24 12:46:15 -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
Michael Jurka
9b93f4def1 Merge "Fix security check for private allocateAppWidgetId api" into jb-mr1-dev 2012-09-24 11:24:26 -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
Siva Velusamy
c0373dfdc1 Do not preload videoeditor_jni since it breaks the emulator 
Video editing is not supported on the emulator, so preloading
this causes the emulator to crash while booting up.

Bug 7200384

Change-Id: I1915d888be328c20aa66ca2318722d5b6e6342b0
 2012-09-24 10:34:42 -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
940eb09727 am d5111f25: Merge "Fix the build." into jb-mr1-dev 
* commit 'd5111f252b731396293caedbee929856acd6b276':
  Fix the build.
 2012-09-24 10:16:40 -07:00
The Android Open Source Project
cdc46670ee am fbba193d: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit 'fbba193d3841b14bcfce02cdb9dd4715eb7dea39':
  Disable content observer cross-user permission checks...
  Disable content observer cross-user permission checks...
  Fix deadlock in LockPatternUtils by using local id.
  Compute GradientDrawable's opacity correctly
  Tweaking how settings adds keyguard widgets
  Settings provider needs to send notifications as itself
  Visualizer only works on sounds >5 sec.
  dodging the @JavascriptInterface bullet
  Fix crash in recents
  Wait for installd to finish starting before booting.
  Temporarily turn off package verification
 2012-09-24 10:14:52 -07:00
Robert Greenwalt
d5111f252b Merge "Fix the build." into jb-mr1-dev 2012-09-24 10:13:57 -07:00
The Android Open Source Project
fbba193d38 Reconcile with jb-mr1-release - do not merge 
Change-Id: I37715a9d2489d282d09a60cf32d92f13c3d82b13
 2012-09-24 10:12:10 -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
4f895c8143 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:00 -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
d1631f76b8 am 0ff65375: Merge "Add columns to CalendarContract" into jb-mr1-dev 
* commit '0ff65375683f5d5f05c7e1882f758cc93be57c99':
  Add columns to CalendarContract
 2012-09-24 09:51:02 -07:00
Amith Yamasani
1294230aa3 am ffdb4fb3: am 888eb73c: resolved conflicts for merge of 814f5ac3 to jb-mr1-dev 
* commit 'ffdb4fb3f8eeac789a57d5b16dfb667ddb9ad21a':
  Fixing services start order that impacts ICS - JB upgrade
 2012-09-24 09:50:31 -07:00
Victoria Lease
089818fe14 am 5d0f02d9: am 8658e1aa: Merge "Allow apps to getProviders() without location permissions." into jb-mr1-dev 
* commit '5d0f02d90cba9920b40159c56d85dbeed6862ddc':
  Allow apps to getProviders() without location permissions.
 2012-09-24 09:50:25 -07:00
Amith Yamasani
ffdb4fb3f8 am 888eb73c: resolved conflicts for merge of 814f5ac3 to jb-mr1-dev 
* commit '888eb73c6e86a18520cbaa999a18e8b039dbed4f':
  Fixing services start order that impacts ICS - JB upgrade
 2012-09-24 09:47:00 -07:00
Alon Albert
0ff6537568 Merge "Add columns to CalendarContract" into jb-mr1-dev 2012-09-24 09:46:59 -07:00
Victoria Lease
5d0f02d90c am 8658e1aa: Merge "Allow apps to getProviders() without location permissions." into jb-mr1-dev 
* commit '8658e1aa1fb0905852c4b0f5ae1d96cd2d56b6cf':
  Allow apps to getProviders() without location permissions.
 2012-09-24 09:46:53 -07:00
The Android Open Source Project
5f25993020 am f959ad7f: (-s ours) am 18fd992b: am a07cbb96: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit 'f959ad7f0d9eaeff01702e8f443074c99378e92d':
  Show plmn in emergency call allowed mode.
  Get your own cursor Drawables, WebViewClassic!
 2012-09-24 09:39:41 -07:00
Kenny Root
fd896079ea am e748729b: am c6f8a998: Merge "LockScreen: don\'t update KeyStore password on unlock" into jb-mr1-dev 
* commit 'e748729b82bf287e153c40eab019e2c6bca33a3b':
  LockScreen: don't update KeyStore password on unlock
 2012-09-24 09:39:37 -07:00
John Spurlock
892c2278c6 am 0c8dfe34: am 2ce1ae8e: Merge "Migrate away from lightsOut() in BeanBagDream." into jb-mr1-dev 
* commit '0c8dfe3486f5650cd7969ff6cbb52fd1cd716be4':
  Migrate away from lightsOut() in BeanBagDream.
 2012-09-24 09:39:34 -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
Romain Guy
08d6526a5e am fff1e8af: am 6b3292ce: Merge "Avoid deadlock when deleting layers Bug #7217459" into jb-mr1-dev 
* commit 'fff1e8afba582cb97eeca75c6c1368ee74588891':
  Avoid deadlock when deleting layers Bug #7217459
 2012-09-24 09:39:23 -07:00
Irfan Sheriff
87151b7009 am 55f133fa: am 916b2b5a: Merge "Increase WFD connect time out to 60s" into jb-mr1-dev 
* commit '55f133fafb0fb239759262d2c61fb0b58ae4dab4':
  Increase WFD connect time out to 60s
 2012-09-24 09:39:19 -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
Jason Sams
42319175c7 am 36331fbc: am ac4bd00c: Change 5x5 convolve to better test impl. 
* commit '36331fbc36762a3667bf06ddbdd381971bbaf44c':
  Change 5x5 convolve to better test impl.
 2012-09-24 09:39:11 -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
Stephen Hines
c5c6c72c5c am de6def1d: am 9c7b5291: Merge "Verify pass-by-value kernels with structs." into jb-mr1-dev 
* commit 'de6def1d9a71a3d19cbe485f11c5cb5259581bac':
  Verify pass-by-value kernels with structs.
 2012-09-24 09:39:04 -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