87115 Commits

Author SHA1 Message Date
Christopher Tate
d87cb794b0 am 0cd3c976: Merge "Settings (and general) restore fixes" into jb-mr1-dev
* commit '0cd3c976a273a25c2d642064ade997bdf9d99855':
  Settings (and general) restore fixes
2012-10-04 19:39:07 -07:00
Christopher Tate
0cd3c976a2 Merge "Settings (and general) restore fixes" into jb-mr1-dev 2012-10-04 19:36:41 -07:00
Christopher Tate
5067685ccf Settings (and general) restore fixes
Pro tem, we ignore wifi configuration data when restoring system settings.
This is not ideal, but it *does* mean we do not bounce wifi off and on
again during the extended restore process, which in turn means we don't
interfere with things like the Play Store's download of applications.
We do continue to back up wifi configuration, and will start using that
data again when the new implementation that restores AP configurations
without having to bounce wifi comes to pass.

Also, this CL fixes a longstanding bug in BackupDataInput.skipEntityData()
that was being reproduced reliably once settings restore was skipping
the wifi-related entities in the restore stream.

Bug 7249405

Change-Id: I61520a9a116b66ebdf95734d09d9afd46406df01
2012-10-04 19:10:11 -07:00
Jim Miller
9fdabab7e9 Allow lower case for owner info in keyguard
bug 7094419

Change-Id: Ic89d51f1d490b99a9cdd897b71057be37004301a
2012-10-04 18:47:18 -07:00
Jeff Brown
a52772ff26 Support animating just the backlight when turning off.
Bug: 7224614
Change-Id: Ic9fa7a9e458c89d347b03bce6829f952bdf3b6a5
2012-10-04 18:39:24 -07:00
Matthew Xie
fca9d63635 Add multi user support for bluetooth
Create a BLUETOOTH_STACK permission to share between all users of
Bluetooth apk. Bluetooth Manager binds to apk of current user
bug 6925422

Change-Id: I2df5546e977c2d77bc66d97d12479d933826922a
2012-10-04 18:35:42 -07:00
Jeff Hamilton
f2e292f554 am 82b94649: Merge "Changes to support updating location providers." into jb-mr1-dev
* commit '82b946496e2a503b5b21af318af5be828a223a44':
  Changes to support updating location providers.
2012-10-04 18:28:02 -07:00
Jeff Hamilton
82b946496e Merge "Changes to support updating location providers." into jb-mr1-dev 2012-10-04 18:23:45 -07:00
Dianne Hackborn
a9e9eb7026 am 0cdbd077: Merge "Fix issue #7290206: Need API to get/look up user serial number" into jb-mr1-dev
* commit '0cdbd0776d141011567e63158aa0a430362425ef':
  Fix issue #7290206: Need API to get/look up user serial number
2012-10-04 18:20:41 -07:00
Dianne Hackborn
0cdbd0776d Merge "Fix issue #7290206: Need API to get/look up user serial number" into jb-mr1-dev 2012-10-04 18:19:01 -07:00
Raph Levien
32d932c72d am 19348623: Merge "Updated Roboto fonts with correct T comma accent encoding" into jb-mr1-dev
* commit '19348623fa006a87e668a1c69c412b0ff5da88c9':
  Updated Roboto fonts with correct T comma accent encoding
2012-10-04 18:19:00 -07:00
Raph Levien
19348623fa Merge "Updated Roboto fonts with correct T comma accent encoding" into jb-mr1-dev 2012-10-04 18:15:55 -07:00
Amith Yamasani
21f0777c11 am c192c649: Merge "Fix serial number assignment for new user on a freshly wiped device" into jb-mr1-dev
* commit 'c192c649ba3b79dff70c5ccf981d631b929b5778':
  Fix serial number assignment for new user on a freshly wiped device
2012-10-04 18:05:34 -07:00
Amith Yamasani
c192c649ba Merge "Fix serial number assignment for new user on a freshly wiped device" into jb-mr1-dev 2012-10-04 18:03:47 -07:00
Adam Cohen
a39c5c369a am 327424d6: Merge "Plumbing to allow keyguard to be shown with user switcher (issue 7175023)" into jb-mr1-dev
* commit '327424d69b99213e872e91f05feba2d0a137d6c7':
  Plumbing to allow keyguard to be shown with user switcher (issue 7175023)
2012-10-04 18:03:36 -07:00
Satoshi Kataoka
0f300c7045 am 284b2053: Merge "Support multi-user switch in TextServicesManagerService" into jb-mr1-dev
* commit '284b20538764afe2500be6ba5b1f3a057123ffc9':
  Support multi-user switch in TextServicesManagerService
2012-10-04 18:03:33 -07:00
Jeff Brown
5430835934 Ensure we send at least one wakeup/gotosleep transition.
This fixes an issue where the device would not lock immediately
when the user quickly pressed power off / power on even if
configured to do so.  We were suppressing the screen off
and wake up broadcast in this case.

Now we make sure to always send at least one broadcast to
indicate the transition.  We still collapse back-to-back
full cycle transitions though so as not to end up enqueuing
useless broadcasts.

Bug: 7061116
Change-Id: I7211c5fd963c271c2b0aceb4d2f746063c629079
2012-10-04 18:03:11 -07:00
Adam Powell
123436ebd5 am 2ee1f656: Merge "MediaRouter/Wireless Display - correct initial state" into jb-mr1-dev
* commit '2ee1f6567d2bc25c58f212354ffd09df18fc0b25':
  MediaRouter/Wireless Display - correct initial state
2012-10-04 18:01:52 -07:00
Christian Robertson
439b85ef9d Updated Roboto fonts with correct T comma accent encoding
Updated Roboto fonts fixing issue where Tcommaaccent and Tcedilla
characters were encoded improperly (their values were switched). This
patch addresses bug 7198855 and bug 7070912. Original was mistakenly
submitted to master but should be applied to jb-mr1-dev instead.

Also, this commit reverts the addition of RobotoCondensed-Light and its
italic, for which we don't have any build file or XML metadata support.

Change-Id: If1c592474f1f7199e98bb98edf4de6466b43fa51
2012-10-04 18:01:14 -07:00
Adam Cohen
327424d69b Merge "Plumbing to allow keyguard to be shown with user switcher (issue 7175023)" into jb-mr1-dev 2012-10-04 18:01:09 -07:00
Satoshi Kataoka
284b205387 Merge "Support multi-user switch in TextServicesManagerService" into jb-mr1-dev 2012-10-04 18:01:09 -07:00
Adam Powell
2ee1f6567d Merge "MediaRouter/Wireless Display - correct initial state" into jb-mr1-dev 2012-10-04 18:00:01 -07:00
Adam Cohen
f752202bee Plumbing to allow keyguard to be shown with user switcher (issue 7175023)
-> Also reduced calls to lockNow, and moved this call in ActivityManagerService

Change-Id: I9ba34ca902f7c0f71fa4ec302104688ca8d11f55
2012-10-04 17:53:01 -07:00
Jeff Brown
25f5a71f31 am 17f36d15: Merge "Allow phone to go to sleep while in call." into jb-mr1-dev
* commit '17f36d154f1a8ebe72fc35af332f5c0069503364':
  Allow phone to go to sleep while in call.
2012-10-04 17:35:29 -07:00
Amith Yamasani
634cf31345 Fix serial number assignment for new user on a freshly wiped device
Bug: 7280093

User serial number was not being bumped up from 0 on a freshly wiped device
due to the userlist not existing. This was resulting in the first 2 users
getting the same serial number, messing up C2DM message delivery. This issue
doesn't show up if you boot the device before adding a user, so it wasn't
discovered earlier.

Change-Id: I8a5d99b9ad2ccfb66a16cacac9548ba53f0be387
2012-10-04 17:34:21 -07:00
Jeff Brown
17f36d154f Merge "Allow phone to go to sleep while in call." into jb-mr1-dev 2012-10-04 17:32:46 -07:00
Amith Yamasani
344e019ace am 82245c19: Merge "Fix dupes in initial wallpaper selection" into jb-mr1-dev
* commit '82245c199b2bbd2f598ce3c863eea425b4909cac':
  Fix dupes in initial wallpaper selection
2012-10-04 17:30:49 -07:00
Amith Yamasani
82245c199b Merge "Fix dupes in initial wallpaper selection" into jb-mr1-dev 2012-10-04 17:29:34 -07:00
Laurent Tu
60ec50a850 Last position improvements for GeofenceManager
Use LocationManager.getLastPosition() in GeofenceManager instead of
keeping track of it manually. Keeping track of it in GeofenceManager
doesn't handle the case where we install a fence, and cross it just
after that based on the last position before we installed the fence.

Also shuffle around some code in LocationManagerService to remember the
last position even if there are no UpdateRecords. This is useful in the
GeofenceManager for example.

Bug: 7047435
Change-Id: Ia8acc32e357ecc2e1bd689432a5beb1ea7dcd1c7
2012-10-04 17:23:12 -07:00
Dianne Hackborn
33f9cb8cf0 Fix issue #7290206: Need API to get/look up user serial number
Change-Id: I1713215e7c205b1b66c36488f89e3fbf4572cb97
2012-10-04 17:15:10 -07:00
Victoria Lease
fddea6042e am dfc8e799: Merge "Handle other providers in isAllowedProviderSafe()" into jb-mr1-dev
* commit 'dfc8e799ed7500c1a07d4ba1f72e77d3de0f803a':
  Handle other providers in isAllowedProviderSafe()
2012-10-04 17:14:45 -07:00
Victoria Lease
b1cc90c553 am 2646b3a4: Merge "Prevent overflow in LocationRequest.setExpireIn()" into jb-mr1-dev
* commit '2646b3a46af3a24d54acffb1f956deeb6831d3ab':
  Prevent  overflow in LocationRequest.setExpireIn()
2012-10-04 17:12:59 -07:00
Victoria Lease
dfc8e799ed Merge "Handle other providers in isAllowedProviderSafe()" into jb-mr1-dev 2012-10-04 17:11:42 -07:00
Victoria Lease
2646b3a46a Merge "Prevent overflow in LocationRequest.setExpireIn()" into jb-mr1-dev 2012-10-04 17:10:22 -07:00
Christopher Tate
f86aeb6636 am dd2f15a5: Merge "Make sure to check write perms after rewriting destination table" into jb-mr1-dev
* commit 'dd2f15a563f18c9534cfa85fe2b8bf2fe100ed83':
  Make sure to check write perms after rewriting destination table
2012-10-04 16:55:55 -07:00
Robert Greenwalt
0d1bd1911e am 7fd1386b: Merge "Properly cancel Tether notification." into jb-mr1-dev
* commit '7fd1386b8a2b30669e0ffe0bacf17dd1feb5dba5':
  Properly cancel Tether notification.
2012-10-04 16:53:25 -07:00
Christopher Tate
dd2f15a563 Merge "Make sure to check write perms after rewriting destination table" into jb-mr1-dev 2012-10-04 16:52:46 -07:00
Victoria Lease
9c6816981f am a9afaccf: Merge "multiuser support for LocationBlacklist" into jb-mr1-dev
* commit 'a9afaccf303da2b57a47ad16cca559e87e649d15':
  multiuser support for LocationBlacklist
2012-10-04 16:51:43 -07:00
Robert Greenwalt
7fd1386b8a Merge "Properly cancel Tether notification." into jb-mr1-dev 2012-10-04 16:50:40 -07:00
Victoria Lease
a9afaccf30 Merge "multiuser support for LocationBlacklist" into jb-mr1-dev 2012-10-04 16:49:15 -07:00
Robert Greenwalt
3cab6b0f1d Properly cancel Tether notification.
When we add a second type of tethering we unify the notifications
into a single generic type.  This is done by canceling the first
and replacing it, but this flow was improperly canceling, so
you could end up with orphaned tethering icons.

bug:7283605
Change-Id: I1d136f51592b4326d48578cf67b69122e45d4984
2012-10-04 16:44:26 -07:00
Adam Powell
11b999d0aa MediaRouter/Wireless Display - correct initial state
Make sure we get the right initial status for wifi displays when a new
display route is first added to the MediaRouter.

Bug 7289746

Change-Id: Id41f704fc88021bd4cdf21e9f4b3c810775e1aea
2012-10-04 16:28:53 -07:00
Jeff Brown
93cbbb25a5 Allow phone to go to sleep while in call.
Bug: 7279383
Change-Id: Ia05490218f40a1843507b95ff48fa07910e582d4
2012-10-04 16:22:04 -07:00
Christopher Tate
34637e57fc Make sure to check write perms after rewriting destination table
The write-permission check must occur after any destination-table
rewriting, otherwise any application would be able to write to
any global setting, by supplying a fraudulent "system" namespace
in the uri, but with a key name that will be redirected to global.

Bug 7289965

Change-Id: I122098a64e40d14e00d3cb6608c50aeb74faf7ce
2012-10-04 16:01:10 -07:00
Jeff Brown
4fb5b85a5b am dce8b948: Merge "Fix parceling of display info flags." into jb-mr1-dev
* commit 'dce8b948320e933e46e4a38c496f56555472495f':
  Fix parceling of display info flags.
2012-10-04 15:27:15 -07:00
Adam Powell
64f369bbc5 am b4fad85c: Merge "Fix regression in AbsListView CHOICE_MODE_SINGLE" into jb-mr1-dev
* commit 'b4fad85ca0ed258e4f8de8045c707a4bf2a6ce66':
  Fix regression in AbsListView CHOICE_MODE_SINGLE
2012-10-04 15:25:36 -07:00
James Dong
68bf6eb411 am d6904819: Merge "Throw an exception instead of crash when a surface does not have a binding surface texture" into jb-mr1-dev
* commit 'd6904819ab0d0ef896cdc129ca23e676dfcee57e':
  Throw an exception instead of crash when a surface does not have a binding surface texture
2012-10-04 15:25:31 -07:00
Laurent Tu
941221c157 Handle other providers in isAllowedProviderSafe()
Add a case for isAllowedProviderSafe() to handle providers that are not
GPS/Passive/Network/Fused. For example, this is useful for mock
providers.

Bug: 7047435
Change-Id: If4799aa90a5338889c47582d45cbfc25772c9c53
2012-10-04 15:18:05 -07:00
Scott Main
2ed01adc8d a few more crosslinks for design guide (to other design docs or dev docs)
Change-Id: Icba63102236b6efe445957f1f3070b705a40e1a9
2012-10-04 15:13:16 -07:00
Jeff Brown
dce8b94832 Merge "Fix parceling of display info flags." into jb-mr1-dev 2012-10-04 15:04:21 -07:00