85453 Commits

Author SHA1 Message Date
John Reck
4be07ade36 Merge "Revert "Test aggressive throttling"" into jb-mr1-dev 2012-09-19 17:06:50 -07:00
Dianne Hackborn
73c14161ec Fix issue #7196015: system_server deadlock during setup wizard
Can't aquire the providers lock while holding the main activity thead
lock, because we call into the activity manager with that lock held.

Change-Id: If27326a2caa46480d0f1b98608be9e8a862febe0
2012-09-19 16:46:54 -07:00
Baligh Uddin
c8d33ad10e Import translations. DO NOT MERGE
Change-Id: If5bb36909e7536aedb40b72ba0899568dce7264c
Auto-generated-cl: translation import
2012-09-19 16:23:58 -07:00
Baligh Uddin
05cf18e13b Import translations. DO NOT MERGE
Change-Id: I23706cb8f364984ad92ab1ce927b108539c141c6
Auto-generated-cl: translation import
2012-09-19 16:23:03 -07:00
Baligh Uddin
fcccd49ff9 Import translations. DO NOT MERGE
Change-Id: I2a8401dcaf19e39bbaedc95071b33c3fc06a3d88
Auto-generated-cl: translation import
2012-09-19 15:52:51 -07:00
Baligh Uddin
12d804444b Import translations. DO NOT MERGE
Change-Id: Ifde9c0b5904b12b873abcf0f3a7522a2e75cfa4d
Auto-generated-cl: translation import
2012-09-19 15:51:05 -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
Jeff Sharkey
4046e01288 Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev 2012-09-19 14:52:34 -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
Kenny Root
55552094a2 Merge "Update preloaded-classes for JB-MR1" into jb-mr1-dev 2012-09-19 14:32:21 -07:00
Eino-Ville Talvala
f7c6c5ad64 NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound
Allow applications to check if the camera shutter sound can be
disabled.

Bug: 7172643
Change-Id: I3e9184325d3676b24830cc5418ebca8dcade8697
2012-09-19 14:31:26 -07:00
John Reck
55bc7efaf9 Revert "Test aggressive throttling"
Bug: 7182109
This reverts commit c7c85b34dad5ee722bd9f14318c1e0e4237d529e.

Change-Id: Ibc8837b97450ec6e77a0e9dd509280ff780bb22b
2012-09-19 14:26:48 -07:00
Eric Laurent
bc0fab1fc2 Add multi user volume management
Notification and Alarm volumes are per user: they are saved and restored
when the foreground user changes.
Media volume is global: it is still saved and restored per user for
implentation reasons but is copied from one user to the next to ensure
media playback volume continuity when switching users.

Ringer mode (silent, vibrate...) is now a global setting.

Bug 7128886.

Change-Id: I9f4f5a0a3985552bca61c2cc3bbe5a144db755a6
2012-09-19 14:16:08 -07:00
Kenny Root
dbf30edf76 Update preloaded-classes for JB-MR1
Bug: 5213043
Change-Id: I13fa58fded8e47d2f11d1fbe6724bd81ce35276a
2012-09-19 13:32:21 -07: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
Jeff Sharkey
4673e7ea8d Migrate UI to supportsMultipleUsers().
Bug: 7194531
Change-Id: Ifbbe3b4d954f8d11fb1c94674e5e7f8e21264c75
2012-09-19 13:14:30 -07:00
Craig Mautner
8f301e6668 Merge "Add debug for b/7094175." into jb-mr1-dev 2012-09-19 13:07:53 -07:00
Christopher Tate
a1c46636dd Merge "Disable content observer cross-user permission checks..." into jb-mr1-dev 2012-09-19 13:01:32 -07:00
Dianne Hackborn
390392ff3e Merge "Changes to support side-loading of apps from other users." into jb-mr1-dev 2012-09-19 12:52:32 -07:00
Christopher Tate
e6c660ab35 Disable content observer cross-user permission checks...
... until we have a solid fix for the singleton ContentProvider
problem cases in place.

Bug 7190837

Change-Id: Ibbef2ddc594896ba7b9217e2856c3e393f525af6
2012-09-19 12:51:35 -07:00
Dianne Hackborn
eba784ff4a Changes to support side-loading of apps from other users.
Change-Id: I5b7c0aa0dc9566b29d5980dc7f42a508a61a58d3
2012-09-19 12:42:37 -07:00
Baligh Uddin
17a54db05d Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-09-19 12:39:50 -07:00
Baligh Uddin
f8d618cb6e Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-19 12:34:40 -07:00
Adam Powell
10bd4106ef am baed0a8f: am 56fd88d8: am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController"
* commit 'baed0a8f0b43191c8f001e064ff42cf27a305d87':
  Implement resolving of icon attributes to resIds in AlertController
2012-09-19 12:26:06 -07:00
Adam Powell
baed0a8f0b am 56fd88d8: am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController"
* commit '56fd88d87ff607f65a963b5500b27ae3d4d2670e':
  Implement resolving of icon attributes to resIds in AlertController
2012-09-19 12:21:15 -07:00
Fabrice Di Meglio
072533e934 Merge "Fix bug #7146516 Padding can be "over" resolved" into jb-mr1-dev 2012-09-19 12:11:49 -07:00
Adam Powell
56fd88d87f am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController"
* commit 'ab12f0f72c22143523e2bce7d58d9f1021abde5c':
  Implement resolving of icon attributes to resIds in AlertController
2012-09-19 11:56:40 -07:00
Fabrice Di Meglio
efa568525f Merge "Fix some typos in Javadoc for Accessibility APIs" into jb-mr1-dev 2012-09-19 11:55:31 -07:00
Raph Levien
d79dd34482 Merge "Add Roboto Thin and Thin Italic fonts, as sans-serif-thin family" into jb-mr1-dev 2012-09-19 11:53:03 -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
Scott Main
5580005cc7 am 9198495b: am 19a39686: am b79d8ecc: udpate media formats for JB
* commit '9198495b2767c507eb983f94b0449f23516240db':
  udpate media formats for JB
2012-09-19 11:27:42 -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
Scott Main
9198495b27 am 19a39686: am b79d8ecc: udpate media formats for JB
* commit '19a39686b7bcf5c47cc0e2f99caca7beb9173212':
  udpate media formats for JB
2012-09-19 11:22:02 -07:00
Glenn Kasten
549be8bead Merge "New API for querying audio properties" into jb-mr1-dev 2012-09-19 11:13:58 -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
Scott Main
19a39686b7 am b79d8ecc: udpate media formats for JB
* commit 'b79d8ecc27c0c7a8c2f8dcc1a752450e4d7d39e2':
  udpate media formats for JB
2012-09-19 11:00:23 -07:00
Adam Powell
ab12f0f72c Merge "Implement resolving of icon attributes to resIds in AlertController" 2012-09-19 10:51:41 -07:00
Baligh Uddin
4d8fbcb228 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-09-19 09:28:07 -07:00
Baligh Uddin
7b6ec1f6fd Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-09-19 09:14:59 -07:00
Narayan Kamath
7047ea7568 am 5d1a870a: Merge "Add APIs to enable SNI and session tickets on sockets." into jb-mr1-dev
* commit '5d1a870a25f7495755432a42cf8c81818dc369fa':
  Add APIs to enable SNI and session tickets on sockets.
2012-09-19 05:51:22 -07:00
Irfan Sheriff
48a9892dbd am 5d4206a5: Merge "Get strings in" into jb-mr1-dev
* commit '5d4206a55c5336a163408422ba3302f5fd8463f7':
  Get strings in
2012-09-19 05:50:40 -07:00
Jim Miller
b6adf0121a am 5d8d169b: Merge "Fix wrong pattern count in keyguard pattern security view." into jb-mr1-dev
* commit '5d8d169bbb0325665d600415bc7b4add2dbcaf75':
  Fix wrong pattern count in keyguard pattern security view.
2012-09-19 05:50:33 -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
Narayan Kamath
5d1a870a25 Merge "Add APIs to enable SNI and session tickets on sockets." into jb-mr1-dev 2012-09-19 01:31:36 -07:00
Scott Main
b79d8ecc27 udpate media formats for JB
Change-Id: Ide41c5dde11298e875c957467c39262dafadcc4c
2012-09-19 00:02:12 -07:00
Irfan Sheriff
5d4206a55c Merge "Get strings in" into jb-mr1-dev 2012-09-18 22:34:34 -07:00
Irfan Sheriff
7f0aaac7f2 Get strings in
Bug: 65904101
Bug: 7087564
Change-Id: Ic4887a737a640010e12efd2a16b24af2215ba72a
2012-09-18 22:06:13 -07:00