Commit Graph

8934 Commits

Author SHA1 Message Date
Jeff Brown
513b8ea16f am 3f1246a2: Merge "Coordinate screen on with the window manager." into jb-mr1-dev
* commit '3f1246a29b58cf78ebe674ec0905ad1795027aac':
  Coordinate screen on with the window manager.
2012-10-05 14:58:01 -07:00
Jeff Brown
3f1246a29b Merge "Coordinate screen on with the window manager." into jb-mr1-dev 2012-10-05 14:55:26 -07:00
Jeff Brown
c38c9be031 Coordinate screen on with the window manager.
Bug: 7267457
Change-Id: Ic2c322253639e1f0b2e4e72a7b145025d0240f93
2012-10-05 14:39:23 -07:00
Dianne Hackborn
ebdc064ddb am 7ef38ea9: Merge "Fix issue #7275122: Wall paper jank when switching users" into jb-mr1-dev
* commit '7ef38ea9e5ee1d2fd58e818f37191a589793e236':
  Fix issue #7275122: Wall paper jank when switching users
2012-10-05 12:57:43 -07:00
Dianne Hackborn
7ef38ea9e5 Merge "Fix issue #7275122: Wall paper jank when switching users" into jb-mr1-dev 2012-10-05 12:54:52 -07:00
Dianne Hackborn
bce0cbb40d Fix issue #7275122: Wall paper jank when switching users
Change-Id: I2677c7641a01b4afe89db29cb5fc1af876f9d078
2012-10-05 11:06:53 -07:00
Jeff Hamilton
7fe7068362 am 20de160c: Revert "Changes to support updating location providers."
* commit '20de160ca32a8f2936a80ffd70551a22e2371d25':
  Revert "Changes to support updating location providers."
2012-10-05 00:48:48 -07:00
Jeff Hamilton
20de160ca3 Revert "Changes to support updating location providers."
This reverts commit c19efc204a.
2012-10-05 02:32:52 -05:00
Matthew Xie
91d1d15624 am d21b4839: Merge "Add multi user support for bluetooth" into jb-mr1-dev
* commit 'd21b483904057212ab1654b8ef606d41f2d3fe46':
  Add multi user support for bluetooth
2012-10-04 23:24:27 -07:00
Matthew Xie
d21b483904 Merge "Add multi user support for bluetooth" into jb-mr1-dev 2012-10-04 23:21:34 -07:00
Daniel Sandler
689a55d813 am f5e2b2c2: Merge "DreamService API revisions." into jb-mr1-dev
* commit 'f5e2b2c26c37d839e6559319d311b62598c6dade':
  DreamService API revisions.
2012-10-04 20:58:27 -07:00
Daniel Sandler
f5e2b2c26c Merge "DreamService API revisions." into jb-mr1-dev 2012-10-04 20:56:08 -07:00
Daniel Sandler
2d78490292 DreamService API revisions.
Reduce reliance on Service interface overrides, instead
steering clients to the DreamService-specific lifecycle
hooks:

  onAttachedToWindow .. onDreamingStarted ..
  onDreamingStopped .. onDetachedFromWindow

The old Dream.java is finally gone now too.

Bug: 7281802
Change-Id: Ib7802c3397fde60ad1132fa49831da182eef4d7a
2012-10-04 23:38:15 -04:00
Jeff Brown
113379842f am a07b1fff: Merge "Support animating just the backlight when turning off." into jb-mr1-dev
* commit 'a07b1fffbe7c43485b35ba83c9083a59ff328df1':
  Support animating just the backlight when turning off.
2012-10-04 20:21:37 -07:00
Jeff Brown
901d8666f9 am 29126cf0: Merge "Ensure we send at least one wakeup/gotosleep transition." into jb-mr1-dev
* commit '29126cf0f7992805b274510420485c95e3741598':
  Ensure we send at least one wakeup/gotosleep transition.
2012-10-04 20:21:34 -07:00
Jeff Brown
a07b1fffbe Merge "Support animating just the backlight when turning off." into jb-mr1-dev 2012-10-04 20:20:25 -07:00
Jeff Brown
29126cf0f7 Merge "Ensure we send at least one wakeup/gotosleep transition." into jb-mr1-dev 2012-10-04 20:19:31 -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
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 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 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
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
dfc8e799ed Merge "Handle other providers in isAllowedProviderSafe()" into jb-mr1-dev 2012-10-04 17:11:42 -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
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
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
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
Amith Yamasani
6474c4cd93 Fix dupes in initial wallpaper selection
Bug: 7281217

Needed to load the settings for the user, in case the user was stopped.

Change-Id: I52d1f59a7681f8c4f7d3596486accb91cb840ecf
2012-10-04 14:55:42 -07:00
Dianne Hackborn
7df202e27a am 8a229195: Merge "Fix issue #6968859: home not exiting an ANR\'d dream" into jb-mr1-dev
* commit '8a2291952528303d284878468fe260ec41998db3':
  Fix issue #6968859: home not exiting an ANR'd dream
2012-10-04 12:43:15 -07:00
Dianne Hackborn
8a22919525 Merge "Fix issue #6968859: home not exiting an ANR'd dream" into jb-mr1-dev 2012-10-04 12:41:41 -07:00
Svetoslav Ganov
c37dc69ca2 am d367b70c: Merge "Accessibility HOVER_ENTER / EXIT without enclosing EXPLORATION_GESTURE_START / END" into jb-mr1-dev
* commit 'd367b70c4ad5d8e6cdbcc0d6d429428413cd39b3':
  Accessibility HOVER_ENTER / EXIT without enclosing EXPLORATION_GESTURE_START / END
2012-10-04 12:32:38 -07:00
Svetoslav Ganov
d367b70c4a Merge "Accessibility HOVER_ENTER / EXIT without enclosing EXPLORATION_GESTURE_START / END" into jb-mr1-dev 2012-10-04 12:31:02 -07:00
John Spurlock
4d97bc2a58 am 27b3819d: Merge "Reset status bar in keyguard, fix MU status bar bug." into jb-mr1-dev
* commit '27b3819df0ff3bbfb680b5bac54ef7e9b4d3aac1':
  Reset status bar in keyguard, fix MU status bar bug.
2012-10-04 12:28:53 -07:00
John Spurlock
27b3819df0 Merge "Reset status bar in keyguard, fix MU status bar bug." into jb-mr1-dev 2012-10-04 12:26:18 -07:00