10554 Commits

Author SHA1 Message Date
Irfan Sheriff
917fc95cac am 314488b7: Merge "Captive check for both mobile and wifi" into jb-mr1-dev
* commit '314488b791d36756504ee593f818f04b4cd24893':
  Captive check for both mobile and wifi
2012-09-21 13:32:22 -07:00
Wink Saville
77196b41da am ca2cb184: Merge "Suppress location information for non-active users." into jb-mr1-dev
* commit 'ca2cb1841099c7206af93149d0326308e0d3f81a':
  Suppress location information for non-active users.
2012-09-21 11:04:35 -07:00
Irfan Sheriff
314488b791 Merge "Captive check for both mobile and wifi" into jb-mr1-dev 2012-09-20 13:33:52 -07:00
Geremy Condra
75f5b6aba6 am f6e24d62: Merge "Remove pointless exception supression." into jb-mr1-dev
* commit 'f6e24d62b6fa863700e5f72d461846f2aa506109':
  Remove pointless exception supression.
2012-09-20 12:51:09 -07:00
Geremy Condra
23f1c10e63 am 4dd3c379: Merge "Remove logging for old version mismatches." into jb-mr1-dev
* commit '4dd3c3797060b35c8e6ebbbdd164c17c6db7b5ec':
  Remove logging for old version mismatches.
2012-09-20 12:51:02 -07:00
Wink Saville
ca2cb18410 Merge "Suppress location information for non-active users." into jb-mr1-dev 2012-09-20 12:37:19 -07:00
Irfan Sheriff
9538bdd3c7 Captive check for both mobile and wifi
Bug: 7113195
Bug: 7102238
Bug: 7087564

Change-Id: Iac08db9de3935338ad498aa3983d2ca82057dda1
2012-09-20 12:13:06 -07:00
Geremy Condra
f6e24d62b6 Merge "Remove pointless exception supression." into jb-mr1-dev 2012-09-20 11:22:14 -07:00
Geremy Condra
4dd3c37970 Merge "Remove logging for old version mismatches." into jb-mr1-dev 2012-09-20 10:33:03 -07:00
Wink Saville
a12a7b3d3d Suppress location information for non-active users.
Specifically, don't allow call backs for LISTEN_CELL_LOCATION and
LISTEN_CELL_INFO.

Bug: 7087342
Change-Id: Ida7f60b5bde3f28264dcb454b38fcfb1f1616d11
2012-09-20 10:09:45 -07:00
John Spurlock
5d514eb468 am e0de5bff: Merge "Fire "dreaming started" and "dreaming stopped" broadcasts." into jb-mr1-dev
* commit 'e0de5bfff2e74ee566ac2d053052de09aa25e54b':
  Fire "dreaming started" and "dreaming stopped" broadcasts.
2012-09-20 06:24:20 -07:00
Jeff Brown
e108978db5 am f803ff4f: Merge "Make wifi display state changes more robust." into jb-mr1-dev
* commit 'f803ff4f743f63dbbb9382d1e1ef7adc25a88e24':
  Make wifi display state changes more robust.
2012-09-20 06:23:43 -07:00
Jeff Brown
cf11e2381a am 925ad51b: Merge "Add support for remembering Wifi display devices." into jb-mr1-dev
* commit '925ad51bd82b34fa26a462a303781c610e635450':
  Add support for remembering Wifi display devices.
2012-09-20 06:23:20 -07:00
Jeff Sharkey
e3981fa8f3 am c3e3311c: Merge "Migrate network stats from removed users." into jb-mr1-dev
* commit 'c3e3311c050f47a229e1b49f1fdf685669d79d53':
  Migrate network stats from removed users.
2012-09-20 06:22:35 -07:00
Craig Mautner
86a14de364 am 6704a48b: Merge "Fixes to Starting window and Wallpaper windows." into jb-mr1-dev
* commit '6704a48bd06f01d2933f83e9b5eda4ed9846bab7':
  Fixes to Starting window and Wallpaper windows.
2012-09-20 06:20:35 -07:00
Dianne Hackborn
78ca366a7f am 52716deb: Merge "Fix deadlock in LockPatternUtils by using local id." into jb-mr1-dev
* commit '52716deb4008da1d566dfd711edc0a9c6de5f79f':
  Fix deadlock in LockPatternUtils by using local id.
2012-09-20 06:20:31 -07:00
Dianne Hackborn
1ed950d0cd am 09ad0832: Merge "Switch to showing top-most thumbnail of recent apps." into jb-mr1-dev
* commit '09ad0832e0c28fa43a2e2bf53bef87df39bd4416':
  Switch to showing top-most thumbnail of recent apps.
2012-09-20 06:19:39 -07:00
Jeff Sharkey
ea59a8367e am a490bddc: Merge changes I4513afbd,I20e2194c into jb-mr1-dev
* commit 'a490bddc8bf0812973dee34ead5c04c87e7ecb15':
  Make getMediaStorageDirectory() user-aware.
  Lockdown should only augment connected networks.
2012-09-20 06:19:30 -07:00
John Spurlock
e0de5bfff2 Merge "Fire "dreaming started" and "dreaming stopped" broadcasts." into jb-mr1-dev 2012-09-20 05:45:54 -07:00
Geremy Condra
350bb15ac7 Remove pointless exception supression.
Bug: 7198235
Change-Id: I3371403a79fd3e01d46678d58129d36eb921d10a
2012-09-20 01:40:03 -07:00
Jeff Brown
c2b9ea6241 Make wifi display state changes more robust.
Bug: 7178216
Change-Id: Icceaeb61730b0b4916cdda44459f4c69553e303c
2012-09-19 23:15:26 -07:00
Jeff Brown
89d5546d7f Add support for remembering Wifi display devices.
Add a setting to globally disable Wifi display.

Fixed a bug where the wifi display broadcast receiver
was running on the wrong thread.

Removed the wifi-display QuickSettings dialog, all functionality
has been moved to Settings.

Bug: 7178216
Bug: 7192799
Change-Id: I9796baac8245d664cf28fa147b9ed978d81d8ab9
2012-09-19 22:04:44 -07:00
Geremy Condra
0967a9edfc Remove logging for old version mismatches.
Since this has no security consequence and triggered by a variety
of totally innocuous things it seems like log noise and so should
be removed.

Bug: 7198235
Change-Id: I80ed5acb378a4c42d5d223b633309bf9526dbf3d
2012-09-19 21:22:42 -07:00
Jeff Sharkey
daa57e8d18 Migrate network stats from removed users.
When a user is removed, migrate all network stats belonging to that
user into special UID_REMOVED bucket.  Also removes those stats from
kernel to avoid double-counting if another user is created.

Bug: 7194784
Change-Id: I03f1d660fe3754566326b7749cae8068fc224ea9
2012-09-19 14:54:05 -07:00
John Spurlock
f4f6b4c8b0 Fire "dreaming started" and "dreaming stopped" broadcasts.
Dream manager now fires broadcast intents when entering + exiting
dreamland (except when testing).

Power manager can now listen for dreams ending, using polling only
as a backstop.

Also:
 - Bullet-proof dream-manager/dream against known failure modes
 - Add new read/write dream permissions
 - Refactor dream-manager to delegate work + state management into
   a new DreamController class, via a handler

Bug:6999949
Bug:7152024
Change-Id: I986bb7812209d8c95ae1d660a5eee5998a7b08b1
2012-09-19 17:36:50 -04:00
Craig Mautner
6704a48bd0 Merge "Fixes to Starting window and Wallpaper windows." into jb-mr1-dev 2012-09-19 13:29:44 -07:00
Dianne Hackborn
52716deb40 Merge "Fix deadlock in LockPatternUtils by using local id." into jb-mr1-dev 2012-09-19 13:28:11 -07:00
Craig Mautner
f1b6741975 Fix deadlock in LockPatternUtils by using local id.
Activity manager now updates window manager's current user id
directly and immediately rather than waiting for a broadcast
update. Window manager passes this through policy to the
KeyguardViewMediator and into LockPatternUtils. LockPatternUtils
no longer goes to Activity to get the current user id if it finds
that its local id is non-default.

Fixes bug 7193726.

Change-Id: Id5613e7a9fe9e5b49e83c26b74504f587c3998c2
2012-09-19 13:18:29 -07:00
Dianne Hackborn
09ad0832e0 Merge "Switch to showing top-most thumbnail of recent apps." into jb-mr1-dev 2012-09-19 11:40:18 -07:00
Dianne Hackborn
15491c6a72 Switch to showing top-most thumbnail of recent apps.
The way it should have been, and with the new recents enter animation
the way it must be.

Added a new method to retrieve this thumbnail, since it would be less
efficient to use the existing API (which always returns the "base"
thumbnail).  Probably at some point that existing API should be tweaked
to always return the top thumbnail instead, but that is for a later time.

Also removed code that would clear the thumbnail associated with an
activity when it is resumed.  I don't think there should ever be a
reason to clear a thumbnail -- it's much better to have *something*
for the task, even if it is a little out of date.

Change-Id: I83e6ca6403eb2df5e4de3009dfe8c210e8cf8d5b
2012-09-19 11:25:40 -07:00
Jeff Sharkey
a490bddc8b Merge changes I4513afbd,I20e2194c into jb-mr1-dev
* changes:
  Make getMediaStorageDirectory() user-aware.
  Lockdown should only augment connected networks.
2012-09-19 11:22:14 -07:00
Craig Mautner
8863cca57d Fixes to Starting window and Wallpaper windows.
- Checking for found wallpaper to match either mWallpaperTarget
or mLowerWallpaperTarget keeps from swapping the layers while
transitioning between two wallpaper activities.

- Fade out RecentsActivity while bringing up selected activity. This
keeps the RecentsActivity from showing through a launching wallpaper
activity.

- When moving a starting window from one activity to another clear
the startingDisplayed flag in the old activity.

- When moving a starting window from one activity to another assign
the new activity's mAppAnimator to the starting window's mWinAnimator.

- Only treat a wallpaper transition as entering if the mWallpaperTarget
is visible and not being hidden. Keeps from assigning the wrong
animation when activities are launched back to back and the
mWallpaperTarget is still animating away.

Fixes bug 7148089.

Change-Id: Idd405b1ba113f3345ca2116d141b474abe5bd4c0
2012-09-19 11:11:46 -07:00
Amith Yamasani
b8e362ae27 am 4adb9d34: Merge "DevicePolicyManager per user" into jb-mr1-dev
* commit '4adb9d34162b109db3c67e352ad50c76dc7f2d45':
  DevicePolicyManager per user
2012-09-19 05:50:07 -07:00
Amith Yamasani
4adb9d3416 Merge "DevicePolicyManager per user" into jb-mr1-dev 2012-09-18 20:00:44 -07:00
Dianne Hackborn
ff88bee1c0 am 1e5aeecb: Merge "Don\'t allow more than 3 actively running users at a time." into jb-mr1-dev
* commit '1e5aeecb64827d2b71f429d73a05c25ffe4a5be8':
  Don't allow more than 3 actively running users at a time.
2012-09-18 18:30:08 -07:00
Dianne Hackborn
1e5aeecb64 Merge "Don't allow more than 3 actively running users at a time." into jb-mr1-dev 2012-09-18 18:22:15 -07:00
Dianne Hackborn
bb1aeff320 Don't allow more than 3 actively running users at a time.
Change-Id: Ic047c62b518a0faaa7b507343909330044ec290b
2012-09-18 18:20:43 -07:00
Jeff Sharkey
0b81be6f79 Lockdown should only augment connected networks.
Bug: 7148397
Change-Id: I20e2194c874544b272b9ec8b63391d91b0a22f49
2012-09-18 15:44:16 -07:00
Jeff Sharkey
ed1a377f80 am 6281d7cf: Merge "Multi-user MTP." into jb-mr1-dev
* commit '6281d7cf32bdc624a9d70b2b4f5abce342558c27':
  Multi-user MTP.
2012-09-18 15:00:33 -07:00
Jeff Sharkey
6281d7cf32 Merge "Multi-user MTP." into jb-mr1-dev 2012-09-18 14:52:46 -07:00
Amith Yamasani
599dd7ce9a DevicePolicyManager per user
Bug: 7136483

Store device policy information for each user and apply them when user switches.

Global proxy can only be controlled by owner.
Camera restriction applies to all users, if any one has an admin that disables it.
Storage encryption can only be controlled by owner, although other users can query the state.
Wipe data will only remove the user if non-zero, wipe the device, if zero.

Change-Id: I359be46c1bc3828fd13d4be3228f11495081c8f2
2012-09-18 14:28:33 -07:00
Andy Stadler
ab3d0fd684 Merge "Move files to make eclipse-java happy" into jb-mr1-dev 2012-09-18 14:20:30 -07:00
Andy Stadler
d44daaba44 Move files to make eclipse-java happy
No changes to text at all, just moving the java files to match their
declared packages.

There was no original bug# but this cleans up the code submitted in
the original Change-Id: I42307f58074157b33b6e01216aab10022340d449

Change-Id: I233fa7f21167a42565aadb7ad109600b1a1a5721
2012-09-18 14:08:30 -07:00
Irfan Sheriff
104212aa7a am 24ed2769: Merge "WFD fixes" into jb-mr1-dev
* commit '24ed2769130a8f9df44e7fc22be52b6282e724c3':
  WFD fixes
2012-09-18 14:03:36 -07:00
Jeff Sharkey
27bd34d9d9 Multi-user MTP.
The current MTP kernel driver at /dev/mtp_usb is exclusive, meaning
only one process can have it open. In addition, each MTP session
with a desktop requires unique object IDs, which doesn't hold true
across users on the device.

To solve these two issues, when switching users we cycle the USB host
stack to disconnect both local and remote MTP connections, giving the
new user's media process a chance to claim /dev/mtp_usb, and causing
the desktop to initiate a new MTP session.

This change also allows BroadcastReceivers to registerReceiver()
allow retrieval of a current sticky broadcast. Adds a system property
to override maximum users. Removes MOUNTED broadcasts for secondary
users. Allows INTERACT_ACROSS_USERS to getCurrentUser().

Bug: 6925114
Change-Id: I02b4a1b535af95fb2142655887b6d15a8068d18a
2012-09-18 13:26:26 -07:00
Irfan Sheriff
24ed276913 Merge "WFD fixes" into jb-mr1-dev 2012-09-18 12:22:06 -07:00
Irfan Sheriff
e0c28d5f13 WFD fixes
- Specificy max GO intent for WFD
- Increase GO idle time out to 20s and use it for GO and client
- Fix connection broadcast

Change-Id: Ia0e28bc9eb3e23d2830a6c814c5a537ca0bcd5db
2012-09-18 12:20:37 -07:00
Amith Yamasani
7d43c417b6 am f7a6dfca: Merge "Pass Bitmap instead of ParcelFileDescriptor in UserManager" into jb-mr1-dev
* commit 'f7a6dfcafc1eaa8014b4fa796e4b31208f72fd36':
  Pass Bitmap instead of ParcelFileDescriptor in UserManager
2012-09-17 22:54:56 -07:00
Amith Yamasani
f7a6dfcafc Merge "Pass Bitmap instead of ParcelFileDescriptor in UserManager" into jb-mr1-dev 2012-09-17 22:53:21 -07:00
Amith Yamasani
e928d7d95d Pass Bitmap instead of ParcelFileDescriptor in UserManager
Add a USER_INFO_CHANGED intent for lockscreen and quicksettings to use
to monitor changes to the user name or icon.

Bug: 7164040
Change-Id: Id6fb8b6d38ce04ccd02bbadcf0c10699783d6c03
2012-09-17 21:46:51 -07:00