11399 Commits

Author SHA1 Message Date
Jeff Brown
a047faed5a am a003f8c6: am f545660d: Merge "Prevent full wake lock from keeping device awake while dreaming." into jb-mr1-dev
* commit 'a003f8c6e62181d803b019267e27ea12498bef4a':
  Prevent full wake lock from keeping device awake while dreaming.
2012-10-09 16:59:46 -07:00
Jeff Brown
329a5a90e4 am 07d655e6: am 637a30fd: Merge "Fix a segfault when there is no power module." into jb-mr1-dev
* commit '07d655e68dc6f604fea1292b8ebc402dd0166f9c':
  Fix a segfault when there is no power module.
2012-10-09 16:57:50 -07:00
Jeff Brown
a003f8c6e6 am f545660d: Merge "Prevent full wake lock from keeping device awake while dreaming." into jb-mr1-dev
* commit 'f545660dcb54f90ad6a79ef0d7dccb509dc69017':
  Prevent full wake lock from keeping device awake while dreaming.
2012-10-09 16:57:15 -07:00
Jeff Brown
07d655e68d am 637a30fd: Merge "Fix a segfault when there is no power module." into jb-mr1-dev
* commit '637a30fde7d1754f8b8a76c08326e1c432ffd93d':
  Fix a segfault when there is no power module.
2012-10-09 16:54:26 -07:00
Jeff Brown
f545660dcb Merge "Prevent full wake lock from keeping device awake while dreaming." into jb-mr1-dev 2012-10-09 16:54:12 -07:00
Jeff Brown
637a30fde7 Merge "Fix a segfault when there is no power module." into jb-mr1-dev 2012-10-09 16:51:49 -07:00
Eric Laurent
9e6e8355f8 fix concurrent headset and HDMI connection
Fix a bug in WiredAccessoryManager causing an
HDMI disconnection to be signaled to AudioService when a
headset is connected.

Bug 7313250.

Change-Id: I7c6446104c55f9a4fc146abe7020df45ad6ba5e7
2012-10-09 16:41:32 -07:00
Jeff Brown
10428748f9 Prevent full wake lock from keeping device awake while dreaming.
A dream may itself hold a wake lock in order to keep the screen
bright as it runs.  However this wake lock also causes the device
to stay awake even when it is not plugged in which is undesirable.

This change makes full wake locks behave differently when napping
or dreaming.  The wake lock still keeps the screen bright but
it does not prevent the device from falling asleep.  This is
similar to our policy of ignoring full wake locks completely when
the device is manually put to sleep by the user.

Bug: 7295909
Change-Id: Id99e82d2143ae1a81629281d6407d7527efb8137
2012-10-09 15:52:31 -07:00
Kenny Root
921d445584 am e8b90ef4: am a8a6b084: Merge "Add fused location provider to real provider list" into jb-mr1-dev
* commit 'e8b90ef442e3f2077b827d6657f8201d87a80cc8':
  Add fused location provider to real provider list
2012-10-09 15:26:11 -07:00
Kenny Root
e8b90ef442 am a8a6b084: Merge "Add fused location provider to real provider list" into jb-mr1-dev
* commit 'a8a6b0848d1c11c3ed0fcb846e3d6c39b91536a0':
  Add fused location provider to real provider list
2012-10-09 15:23:58 -07:00
Kenny Root
a8a6b0848d Merge "Add fused location provider to real provider list" into jb-mr1-dev 2012-10-09 15:21:36 -07:00
Jeff Brown
0a19d001c4 Fix a segfault when there is no power module.
This can happen in the emulator.

Bug: 7315152
Change-Id: I4a3f547127419fcd4dc4fc1c6f7ee869706cf12e
2012-10-09 14:47:05 -07:00
rich cannings
8f02205740 am dcecd6f3: am f1b246dd: Merge "Fix verfication bypassed for adb installs" into jb-mr1-dev
* commit 'dcecd6f3b3e2f0021bf5668ded122214ec51f786':
  Fix verfication bypassed for adb installs
2012-10-09 14:15:19 -07:00
rich cannings
dcecd6f3b3 am f1b246dd: Merge "Fix verfication bypassed for adb installs" into jb-mr1-dev
* commit 'f1b246ddfed6757180768eea080b80c1538333f3':
  Fix verfication bypassed for adb installs
2012-10-09 14:13:13 -07:00
rich cannings
f1b246ddfe Merge "Fix verfication bypassed for adb installs" into jb-mr1-dev 2012-10-09 14:11:21 -07:00
rich cannings
36070b414a Fix verfication bypassed for adb installs
ADB installs appear as UserHandle.USER_ALL, and can only be performed by
UserHandle.USER_OWNER, so use the package verifier for UserHandle.USER_OWNER.
This returns a valid userId to call PackageManagerService.getPackageUid.

Bug: 7293091
Change-Id: I7a5497cfe5fa2e7aa804345cf9f507ec26a0db21
2012-10-09 13:34:51 -07:00
Craig Mautner
f1f3b49b94 Remove debugging statements before final ROM.
Change-Id: I18afd1a4c4f8f945308edc9b3af48b8c8adb3b9e
2012-10-09 13:23:08 -07:00
Kenny Root
c3575188c2 Add fused location provider to real provider list
During testing it's possible to mock a location provider, but the fused
location provider wasn't being inserted into the "mRealProviders" map so
when the fused location provider was unmocked, it would disappear
permanently from the list until the next reboot.

Bug: 6949478
Change-Id: I4993aa7fbbd21cea16bdbf2722d637c909b1cd73
2012-10-09 12:44:42 -07:00
Victoria Lease
45e001a3ce am 45bdc2c1: am c0c0c0e6: Merge "Multiuser love for LocationManager" into jb-mr1-dev
* commit '45bdc2c170d37ac4821423f28cda141687256ab2':
  Multiuser love for LocationManager
2012-10-09 12:27:08 -07:00
Victoria Lease
45bdc2c170 am c0c0c0e6: Merge "Multiuser love for LocationManager" into jb-mr1-dev
* commit 'c0c0c0e612e1ccf1e55eb2a9338ddfff40d8d7f2':
  Multiuser love for LocationManager
2012-10-09 12:24:42 -07:00
Victoria Lease
c0c0c0e612 Merge "Multiuser love for LocationManager" into jb-mr1-dev 2012-10-09 12:22:03 -07:00
Satoshi Kataoka
1bb002c73b am 255cfabb: am 6be35dd6: Merge "Fix an issue on showInputMethodPickerFromClient" into jb-mr1-dev
* commit '255cfabba64711559601e9a11586587f4ff61cf9':
  Fix an issue on showInputMethodPickerFromClient
2012-10-09 00:31:36 -07:00
Satoshi Kataoka
255cfabba6 am 6be35dd6: Merge "Fix an issue on showInputMethodPickerFromClient" into jb-mr1-dev
* commit '6be35dd636bd530a781e997ea9f9a43fc82a1fef':
  Fix an issue on showInputMethodPickerFromClient
2012-10-09 00:30:13 -07:00
Satoshi Kataoka
6be35dd636 Merge "Fix an issue on showInputMethodPickerFromClient" into jb-mr1-dev 2012-10-09 00:28:17 -07:00
Jeff Brown
33c30e36a5 am 102e97bb: am 8f4baad3: Merge "Blank or unblank all displays as need." into jb-mr1-dev
* commit '102e97bb6dda1b211acbc4e6e3d3ae58039c9a0d':
  Blank or unblank all displays as need.
2012-10-09 00:07:05 -07:00
Jeff Brown
102e97bb6d am 8f4baad3: Merge "Blank or unblank all displays as need." into jb-mr1-dev
* commit '8f4baad387d8ad63efbc05cfa8c4e4c472793deb':
  Blank or unblank all displays as need.
2012-10-09 00:05:26 -07:00
Satoshi Kataoka
c86884cd83 Fix an issue on showInputMethodPickerFromClient
Bug: 7302748
Change-Id: Iff4345d26b3d6e4bfedf893bbd6a864c771df01d
2012-10-09 15:20:29 +09:00
Jeff Brown
9e316a1a2a Blank or unblank all displays as need.
Ensures that both the internal display and HDMI are blanked
or unblanked in tandem.

Bug: 7309812
Change-Id: Ie8b96d393e8bb20d23c92f3320142d9f7cf42aff
2012-10-08 19:23:15 -07:00
Victoria Lease
b711d57ca4 Multiuser love for LocationManager
LocationManagerService now keeps track of the current user ID and
denies location requests made by all but the foreground user.

Additionally, location settings are now user-specific, rather than
global to the device. Location provider services now run as specific
users, and when the device's foreground user changes, we rebind to
appropriately-owned providers.

Bug: 6926385
Bug: 7247203
Change-Id: I346074959e96e52bcc77eeb188dffe322b690879
2012-10-08 17:19:43 -07:00
Jeff Brown
5532da8fc5 am 541d8d2c: am 2aac1a0f: Merge "Improve the power off fade animation." into jb-mr1-dev
* commit '541d8d2c2bacb81440fb5b5a8766c1e25f1270a9':
  Improve the power off fade animation.
2012-10-08 17:04:10 -07:00
Jeff Brown
541d8d2c2b am 2aac1a0f: Merge "Improve the power off fade animation." into jb-mr1-dev
* commit '2aac1a0fe8fe5dea1185374ed914f95101de16ed':
  Improve the power off fade animation.
2012-10-08 17:02:30 -07:00
Jeff Brown
2aac1a0fe8 Merge "Improve the power off fade animation." into jb-mr1-dev 2012-10-08 17:00:18 -07:00
Jeff Brown
252c206984 Improve the power off fade animation.
Fixes an issue where the dim surface alpha was not actually being
animated like it was supposed to.

Bug: 7224614
Change-Id: Iffd54367ca97ae7fd4b9603807f4e036750442b2
2012-10-08 16:21:01 -07:00
Victoria Lease
c7fe33b1f3 am c1bb4bfb: am 0fb7e32a: Merge "Last position improvements for GeofenceManager" into jb-mr1-dev
* commit 'c1bb4bfb2832f0be3ea2982dd834af1449e03806':
  Last position improvements for GeofenceManager
2012-10-08 15:19:35 -07:00
Victoria Lease
c1bb4bfb28 am 0fb7e32a: Merge "Last position improvements for GeofenceManager" into jb-mr1-dev
* commit '0fb7e32a0129e9e62d58ea652cc00f8a908d65b5':
  Last position improvements for GeofenceManager
2012-10-08 15:17:37 -07:00
Svetoslav Ganov
51b60bf0e0 am b2e330c6: am 55c70293: Merge "Show the touch explore enable dialog for the current user." into jb-mr1-dev
* commit 'b2e330c6c41c21a5ab9c017257c5145d7f8b6ec7':
  Show the touch explore enable dialog for the current user.
2012-10-08 15:15:39 -07:00
Dianne Hackborn
a4c88ee991 am 1b94df8a: am 4efbab48: Merge "Framework side of issue #7302511: GCM client needs to use new framework API..." into jb-mr1-dev
* commit '1b94df8af9a6922bfba7e2ecca24bb0d7578a8e2':
  Framework side of issue #7302511: GCM client needs to use new framework API...
2012-10-08 15:15:36 -07:00
Victoria Lease
0fb7e32a01 Merge "Last position improvements for GeofenceManager" into jb-mr1-dev 2012-10-08 15:14:49 -07:00
Svetoslav Ganov
b2e330c6c4 am 55c70293: Merge "Show the touch explore enable dialog for the current user." into jb-mr1-dev
* commit '55c7029312f67a80c658fa84bd404ef7569d02d8':
  Show the touch explore enable dialog for the current user.
2012-10-08 15:05:08 -07:00
Dianne Hackborn
1b94df8af9 am 4efbab48: Merge "Framework side of issue #7302511: GCM client needs to use new framework API..." into jb-mr1-dev
* commit '4efbab480d7e1b770c5515a76b897359730c1a4d':
  Framework side of issue #7302511: GCM client needs to use new framework API...
2012-10-08 15:05:04 -07:00
Svetoslav Ganov
55c7029312 Merge "Show the touch explore enable dialog for the current user." into jb-mr1-dev 2012-10-08 15:02:56 -07:00
Dianne Hackborn
4efbab480d Merge "Framework side of issue #7302511: GCM client needs to use new framework API..." into jb-mr1-dev 2012-10-08 15:02:56 -07:00
Dianne Hackborn
36d337adff Framework side of issue #7302511: GCM client needs to use new framework API...
...to fix background->shutdown delivery race

Add ACTION_STOPPING and ACTION_STARTING to allow such apps to keep track of
which users are started/stopped, and be involved in the process of stopping
a user.

Also get rid of the scale part of the wallpaper transitions, since it seems
like I have still failed at getting the user switch to wait until the new
wallpaper is displayed.

Change-Id: If7e8fdae3544a9d7987a1b9274dc8b49022f6f62
2012-10-08 14:33:47 -07:00
Svetoslav Ganov
318b00bfee Show the touch explore enable dialog for the current user.
1. We are showing a warning dialog if the user enables an accessibility
   service that requests explore by touch. This dialog was shown only
   for the owner but should be shown for the current user.

bug:7304437

Change-Id: I692b5112df16405e6d2e4890aafbfde79981f973
2012-10-08 13:18:12 -07:00
Craig Mautner
86f0e71592 am 9641fc30: am 847b1229: Merge "Fix problems with IME layers." into jb-mr1-dev
* commit '9641fc3091c59f224a1a64ca7fd1a952271a08e2':
  Fix problems with IME layers.
2012-10-08 12:33:16 -07:00
Craig Mautner
9641fc3091 am 847b1229: Merge "Fix problems with IME layers." into jb-mr1-dev
* commit '847b12295e0a5c9e04f344f04c3540751ef6b9d1':
  Fix problems with IME layers.
2012-10-08 12:30:54 -07:00
Craig Mautner
847b12295e Merge "Fix problems with IME layers." into jb-mr1-dev 2012-10-08 12:28:23 -07:00
Craig Mautner
e6f7d5054a Fix problems with IME layers.
The query WindowState.isDisplayed did not take into account being
displayed due to app animations.

When an existing input method target was animating away the logic
for detecting if it was still on screen was faulty. This led to
assigning the input method to a layer below its target and obscuring
the input method until the animation was complete.

Bug: 7296703 fixed.
Change-Id: Ib00db4f21b726ed57d25d6a1e796b65a7d45ee97
2012-10-08 10:34:17 -07:00
Amith Yamasani
45e3c4f0c7 am 1409c99f: am 9c2a38ed: Merge "Fix resource reading for secondary users" into jb-mr1-dev
* commit '1409c99f8b64adcedf30b8709a22dbb257710f94':
  Fix resource reading for secondary users
2012-10-07 23:41:13 -07:00
Dianne Hackborn
c283140f63 am edc3f3f3: am b52b6bf1: Merge "Fix issue #7295951: Mako asks which Launcher to use at every re-boot" into jb-mr1-dev
* commit 'edc3f3f3415ebfb59f4bfb1143fca85aa65e1fca':
  Fix issue #7295951: Mako asks which Launcher to use at every re-boot
2012-10-07 23:40:45 -07:00