86030 Commits

Author SHA1 Message Date
Irfan Sheriff
fa3b6258be Cleanup on async disconnect and finalize
Bug: 7326726
Change-Id: I6cca47a70cc0f29c68f922618cdcc181fb919a05
2012-10-11 14:21:34 -07:00
Irfan Sheriff
17cf1f2bbc Fix build
had local changes from b/7318044

Change-Id: Idc6907d648a07d36f93dee859e361e9655cdd8e6
2012-10-09 17:13:37 -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
Irfan Sheriff
79dc154afe Merge "Disable poor network avoidance by default" into jb-mr1-dev 2012-10-09 16:31:03 -07:00
Christopher Tate
b30a8568a8 Merge "Defer wifi bounce following restore for 1 minute..." into jb-mr1-dev 2012-10-09 16:05:04 -07:00
Christopher Tate
c9c47f821a Merge "Back up / restore the "Avoid poor connections" wifi setting" into jb-mr1-dev 2012-10-09 15:57:06 -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
Irfan Sheriff
bbe461b78f Disable poor network avoidance by default
Bug: 7318044
Change-Id: Icf27e823453eeaba901aad6f3f8eedea242794f9
2012-10-09 15:49:33 -07:00
Christopher Tate
16eb7cd457 Back up / restore the "Avoid poor connections" wifi setting
Bug 7318177

Change-Id: I8fdc037f823b8c57727e7d49c5bffdc9b3c10ebb
2012-10-09 15:26:30 -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
Eino-Ville Talvala
cbdb213646 Merge "Camera: Query AudioService for shutter sound enforcement." into jb-mr1-dev 2012-10-09 15:21:36 -07:00
Jim Miller
74bc9b6851 Merge "Implement music and user priority scheme in keyguard" into jb-mr1-dev 2012-10-09 15:12:44 -07:00
Christopher Tate
d488bc0ef4 Defer wifi bounce following restore for 1 minute...
...to allow network-reliant restore actions by apps to get underway.

Bug 7304761

Change-Id: Ia1d2321ef86609588efbc7add043c24a12ec6a20
2012-10-09 15:11:01 -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
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
Robert Greenwalt
64cb35c078 Merge "Add config resource to help ATT prepaid" into jb-mr1-dev 2012-10-09 13:27:45 -07:00
Adam Powell
160621280d Merge "Allow more scaling values to be tuned in resource overlays" into jb-mr1-dev 2012-10-09 13:25:12 -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
c0c0c0e612 Merge "Multiuser love for LocationManager" into jb-mr1-dev 2012-10-09 12:22:03 -07:00
Robert Greenwalt
901ac560ca Add config resource to help ATT prepaid
bug:7306353
Change-Id: I8da9e7591ad5e28d5b319df11435333da44fb7d3
2012-10-09 12:20:08 -07:00
Winson Chung
e45c4e42d2 Merge "Increasing timeout for screenshot chord in keyguard. (Bug 6941775)" into jb-mr1-dev 2012-10-09 12:18:02 -07:00
Christopher Tate
af3cd21b08 Merge "New command line tool: "settings"" into jb-mr1-dev 2012-10-09 11:43:56 -07:00
Robert Ly
0f31450fe0 am fba8b7f5: am f19e4b42: Merge "docs: nfc ndef helper methods bug 5957772" into jb-dev
* commit 'fba8b7f5963cb2bc15f06d83d986345978cc415e':
  docs: nfc ndef helper methods bug 5957772
2012-10-09 11:42:14 -07:00
Robert Ly
fba8b7f596 am f19e4b42: Merge "docs: nfc ndef helper methods bug 5957772" into jb-dev
* commit 'f19e4b420de65306f09c199829e7e06fe210e21d':
  docs: nfc ndef helper methods bug 5957772
2012-10-09 11:40:34 -07:00
Robert Ly
f19e4b420d Merge "docs: nfc ndef helper methods bug 5957772" into jb-dev 2012-10-09 11:38:00 -07:00
Eric Laurent
14dfe4e0ab Merge "enforce camera sound according to country code" into jb-mr1-dev 2012-10-09 11:29:11 -07:00
Adam Powell
3307958c6b Allow more scaling values to be tuned in resource overlays
Bug 7267507

Change-Id: I3fba6882a0ac4cb7d34430ba36dec83c030a73cd
2012-10-09 11:21:08 -07:00
Irfan Sheriff
b312163dde Merge "Fix handling of hidden access points" into jb-mr1-dev 2012-10-09 11:11:29 -07:00
Irfan Sheriff
462ff630e4 Fix handling of hidden access points
We now get raw hex data from the supplicant and we convert it into
printable format.

For hidden access point, we always used to return a single empty string.
We need to make sure we maintain that behavior for apps to not start
displaying empty strings.

Bug: 7310749
Change-Id: I2599b9b5e15be91fc34e9af629ad893b1a0357fc
2012-10-09 10:56:47 -07:00
Dirk Dougherty
3b9e7f3238 am fb554fc0: am b049b1ef: am 46c4b488: Doc change: Subscriptions free trials on Google Play.
* commit 'fb554fc0bf46b17314df26bdfb683c580b18f214':
  Doc change: Subscriptions free trials on Google Play.
2012-10-09 10:39:06 -07:00
Dirk Dougherty
fb554fc0bf am b049b1ef: am 46c4b488: Doc change: Subscriptions free trials on Google Play.
* commit 'b049b1ef81d301359444b6b18671a513373ba221':
  Doc change: Subscriptions free trials on Google Play.
2012-10-09 10:36:43 -07:00
Dirk Dougherty
b049b1ef81 am 46c4b488: Doc change: Subscriptions free trials on Google Play.
* commit '46c4b4886ae7b3a982cb1803f2b3ed7b7aa5f1c4':
  Doc change: Subscriptions free trials on Google Play.
2012-10-09 10:33:53 -07:00
Dirk Dougherty
46c4b4886a Doc change: Subscriptions free trials on Google Play.
Change-Id: I981eb94658f9f152d1c1a9915ffaadd63b4a965d
2012-10-09 10:17:55 -07:00
Amith Yamasani
e8f67ed30b Merge "Add an upgrade step for settings moved to global." into jb-mr1-dev 2012-10-09 09:40:39 -07:00
Michael Jurka
7ed267f538 Fix one case where recents is sometimes not visible
Bug: 7299653
2012-10-09 17:03:38 +02:00
Satoshi Kataoka
6be35dd636 Merge "Fix an issue on showInputMethodPickerFromClient" into jb-mr1-dev 2012-10-09 00:28:17 -07:00
Jeff Brown
8f4baad387 Merge "Blank or unblank all displays as need." into jb-mr1-dev 2012-10-09 00:02:46 -07:00
Eino-Ville Talvala
4f8e5ce21d Camera: Query AudioService for shutter sound enforcement.
The AudioService now tracks the shutter sound enforcement status, in
addition to the existing approach. Check with it when doing shutter
sound operations.

Bug: 7032634
Change-Id: Ief855d3a36ca5679832cf439f5638b10f70b8636
2012-10-08 23:53:48 -07:00
Satoshi Kataoka
c86884cd83 Fix an issue on showInputMethodPickerFromClient
Bug: 7302748
Change-Id: Iff4345d26b3d6e4bfedf893bbd6a864c771df01d
2012-10-09 15:20:29 +09:00
Jim Miller
223ce5c732 Implement music and user priority scheme in keyguard
This fixes an issue where the music transport hangs around indefinitely.
It used to get dismissed when music stopped playing and a notification came in.
This was due to a bug in JB.

Now that the bug is fixed,  the music control hangs around indefinitely until
the application actually releases it.

Since we have widget support, we can now leave the transport control in place
for as long as it's possible to resume music (state = playing | paused).

If music is playing, we start with the trasport showing
If not, and multi-user is enabled for more than one user, we show the user switcher.
Otherwise, we show the clock.

Bug 7290707

Change-Id: I6f0553a64b7b66bac7b35eca6d8a8793c15b918c
2012-10-08 21:48:30 -07:00
Adam Powell
434f817233 Merge "Don't do a wifi p2p scan in MediaRouter if we're already connected" into jb-mr1-dev 2012-10-08 21:20:20 -07:00
Adam Powell
b072a9686c Don't do a wifi p2p scan in MediaRouter if we're already connected
When we're connected to a wifi display already, some configurations
might hiccup or otherwise disrupt the media stream if we initiate a
new scan. Block the MediaRouter's default scanning behavior if we
start up while already connected to a wifi display. (A scan will still
occur if the user opens the picker dialog.)

Change-Id: I413efa883eec41fe0377da18bcb55bc72e2ac729
2012-10-08 20:56:35 -07:00
Winson Chung
1cea2f3d87 Increasing timeout for screenshot chord in keyguard. (Bug 6941775)
Change-Id: Ie846ce18878f9597e9f0cd97d78322b59042d43c
2012-10-08 20:42:31 -07: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
Christopher Tate
af75948cdd New command line tool: "settings"
Because the usual content provider interface doesn't allow specification of
the target user under which to perform settings reads/writes, this CL introduces
a new command line app specifically for that.

Usage:

   settings [--user num] get namespace key
   settings [--user num] put namespace key value

If a --user argument is not given, the owner user is targetted.

Bug 7299066

Change-Id: I73108bb76b04fad133cc4e0f218d64490de549f1
2012-10-08 18:39:27 -07:00
Brian Colonna
eb7f1571ae Merge "FUL fallback is no longer account login - fix b/7280196" into jb-mr1-dev 2012-10-08 17:39:16 -07:00
Jim Miller
0c9b5359bd Merge "Fix "checking account" string" into jb-mr1-dev 2012-10-08 17:26:22 -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