10569 Commits

Author SHA1 Message Date
Adam Cohen
44f52cf7e1 am 11a6450e: Merge "Fixing partiallyUpdateAppWidget to cache the new changes" into jb-mr1-dev
* commit '11a6450e543d5c178c60ce2216fad1b29bf15457':
  Fixing partiallyUpdateAppWidget to cache the new changes
2012-09-21 13:35:02 -07:00
Irfan Sheriff
ffded18154 am 957fadc5: Merge "Use min group owner intent for concurrency" into jb-mr1-dev
* commit '957fadc5001be0f0b4d004dbed8c57b6e1f5b46a':
  Use min group owner intent for concurrency
2012-09-21 13:34:58 -07:00
Jeff Brown
9f94633370 am b4c33679: Merge "Disentangle input manager service startup." into jb-mr1-dev
* commit 'b4c33679cbdec9e12369fb49469ce33ed83ed25c':
  Disentangle input manager service startup.
2012-09-21 13:34:44 -07:00
Jeff Brown
76a678e802 am ddfaa3f5: Merge "Provide a debugging option to force enable wifi display." into jb-mr1-dev
* commit 'ddfaa3f55638db2e3d7c9928b605c2e6b90facae':
  Provide a debugging option to force enable wifi display.
2012-09-21 13:34:40 -07:00
Dianne Hackborn
22b46b6fa4 am 6de76d21: Merge "Implement multi-user PackageMonitor." into jb-mr1-dev
* commit '6de76d21ff60818f8b296fc8f645897203f475da':
  Implement multi-user PackageMonitor.
2012-09-21 13:32:57 -07:00
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
Adam Cohen
11a6450e54 Merge "Fixing partiallyUpdateAppWidget to cache the new changes" into jb-mr1-dev 2012-09-20 18:09:11 -07:00
Irfan Sheriff
957fadc500 Merge "Use min group owner intent for concurrency" into jb-mr1-dev 2012-09-20 18:05:22 -07:00
Irfan Sheriff
99766cf40e Use min group owner intent for concurrency
Our device only supports STA & GC concurrency

Change-Id: I4f16c959a6f4e7ad5610dcae67be830d741f162c
2012-09-20 17:18:20 -07:00
Jeff Brown
b4c33679cb Merge "Disentangle input manager service startup." into jb-mr1-dev 2012-09-20 17:03:52 -07:00
Jeff Brown
ddfaa3f556 Merge "Provide a debugging option to force enable wifi display." into jb-mr1-dev 2012-09-20 17:02:27 -07:00
Jeff Brown
a9d131c308 Disentangle input manager service startup.
We will be adding additional callbacks for other components.
This change makes it clearer how the input manager is started
and where the callbacks are initialized.

Bug: 6548391
Change-Id: I4b2a61482126a12b7cf11fafe513f846c76c11e5
2012-09-20 16:48:17 -07:00
Jeff Brown
bbd28a293f Provide a debugging option to force enable wifi display.
Bug: 7179627
Change-Id: I84c7605a1cee5ed723341eebdcec4a824e7e4d38
2012-09-20 16:47:15 -07:00
Adam Cohen
fbe44b7d5e Fixing partiallyUpdateAppWidget to cache the new changes
-> This is a good change to the widget framework that I've wanted to
   make for a while, but issue 7174198 triggered the immediate need.

Change-Id: I3f267e0e67f2d9f28920bb53973af365a3c9e0ba
2012-09-20 15:18:47 -07:00
Dianne Hackborn
6de76d21ff Merge "Implement multi-user PackageMonitor." into jb-mr1-dev 2012-09-20 14:54:10 -07:00
Dianne Hackborn
c72fc674a3 Implement multi-user PackageMonitor.
New APIs let you indicate what user(s) to monitor, and tell you
what user is changing when receiving a callback.

Fix package manager to only deliver package brpadcasts to the
running users.  (This isn't really a change in behavior, since
the activity manager would not deliver to stopped users anyway).
Make sure all broadcasts that package monitor receives also include
user information for it to use.

Update wallpaper service to (hopefully) now Really Correctly
monitor package changes per user.

Change-Id: Idd952dd274abcaeab452277d9160d1ae62919aa0
2012-09-20 14:53:18 -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