27215 Commits

Author SHA1 Message Date
Fabrice Di Meglio
a65fe884d1 Fix the build
Change-Id: Ia021742fb33671f9ece48180789757297fa60001
2012-09-23 11:54:51 -07:00
Fabrice Di Meglio
d88e3054d0 Fix bug #7206086 NumberPicker widget should use locale digits
- fix for having the TwoDigitFormatter being able to be recreated if the locale is changed
- accept now also the Arabic and Persian digits

Change-Id: Ifbf7e274d971008f4a5782402d4b76d9472b68fc
2012-09-21 18:42:47 -07:00
Jeff Sharkey
4e7b551fbf Merge "Move HAS_TRANSIENT_STATE flag into a safe area." into jb-mr1-dev 2012-09-19 19:16:24 -07:00
Jeff Sharkey
36901b6c60 Move HAS_TRANSIENT_STATE flag into a safe area.
Previously, this flag conflicted with other text direction flags,
which can cause weird interactions across the View hierarchy,
specifically with ListView.

Also adds dumpFlags() utility to dump values of all know flags for
documentation and sanity checking.

Bug: 7189738
Change-Id: Iceb2f93f68a800e19a5889ced93abcce4932b067
2012-09-19 19:07:34 -07:00
Jeff Sharkey
c3e3311c05 Merge "Migrate network stats from removed users." into jb-mr1-dev 2012-09-19 18:58:07 -07:00
Christopher Tate
c575e007e5 Merge "setShowGTalkServiceStatus() is deprecated but tested by CTS" into jb-mr1-dev 2012-09-19 18:35:08 -07:00
Christopher Tate
c8c083862f setShowGTalkServiceStatus() is deprecated but tested by CTS
So its implementation has to hang around on that basis.

Bug 7164713

Change-Id: Ibb59932b3b6d275d8ac8e091774b08256a258db1
2012-09-19 17:18:18 -07:00
John Reck
4be07ade36 Merge "Revert "Test aggressive throttling"" into jb-mr1-dev 2012-09-19 17:06:50 -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 Reck
55bc7efaf9 Revert "Test aggressive throttling"
Bug: 7182109
This reverts commit c7c85b34dad5ee722bd9f14318c1e0e4237d529e.

Change-Id: Ibc8837b97450ec6e77a0e9dd509280ff780bb22b
2012-09-19 14:26:48 -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
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
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
Adam Powell
ab12f0f72c Merge "Implement resolving of icon attributes to resIds in AlertController" 2012-09-19 10:51:41 -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
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
Amith Yamasani
4adb9d3416 Merge "DevicePolicyManager per user" into jb-mr1-dev 2012-09-18 20:00:44 -07:00
Fabrice Di Meglio
69542e48c3 Fix some typos in Javadoc for Accessibility APIs
Change-Id: Ie3ca20e1c3bb11fb59bd7dcaed9ea92be320b3eb
2012-09-18 19:34:34 -07:00
Adam Powell
98c370e71d Merge "Make invalidateOptionsMenu asynchronous" into jb-mr1-dev 2012-09-18 18:42:59 -07:00
Adam Powell
4b6d93fd04 Make invalidateOptionsMenu asynchronous
Process any pending menu invalidations on the animation tick, before
traversals are performed. Collapse multiple menu invalidations
together.

Bug 7189372

Change-Id: I7a33ae9813980eb8fbcc958804de2c03328ecca8
2012-09-18 18:37:28 -07:00
Andy Stadler
8071124375 Move X509TrustManagerExtensions to correct directory
Also removed unused imports.

Original Change-Id: If117ffd2240a7bf3437115f3cf2f766c4e249600

Change-Id: I66886ee9792c23a1e421022fd1f675fdf35ea049
2012-09-18 17:40:14 -07:00
Jeff Sharkey
3fe5bf6d69 Make getMediaStorageDirectory() user-aware.
Bug: 7173591
Change-Id: I4513afbd8c3d6a31cd66d8a149be4071d5a4d24c
2012-09-18 15:54:52 -07:00
Fabrice Di Meglio
9ffc6047f1 Merge "Fix bug #7173155 API REVIEW: android.view.View" into jb-mr1-dev 2012-09-18 15:42:34 -07:00
Fabrice Di Meglio
c11f77fbae Fix bug #7173155 API REVIEW: android.view.View
- remove getFocusRect(Rect) as it was redundant
- fix Javadoc

Change-Id: I3784c4b0a38770cba5d3ba09196f9271050a3c20
2012-09-18 15:33:07 -07:00
Jeff Sharkey
6281d7cf32 Merge "Multi-user MTP." into jb-mr1-dev 2012-09-18 14:52:46 -07:00
Fabrice Di Meglio
20586fa035 Merge "Fix bug #7173351 API REVIEW: android.util.LocaleUtil" into jb-mr1-dev 2012-09-18 14:48:48 -07:00
Adam Cohen
642258a29b Merge "Tweaking how settings adds keyguard widgets" into jb-mr1-dev 2012-09-18 14:48:48 -07:00
Fabrice Di Meglio
dbed514e13 Merge "Fix bug #7172699" into jb-mr1-dev 2012-09-18 14:46:59 -07:00
Adam Cohen
60264730c1 Tweaking how settings adds keyguard widgets
-> Fix for issue 7173587
-> Fix for issue 7173877

Change-Id: I60cd3952113335df60292f67461d50f6c8bd2ed3
2012-09-18 14:38:04 -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
Geremy Condra
cb4c581975 Fix bad isinstance check in X509TrustManagerExtensions and add test.
Change-Id: I333957186655b2543a637dafa8c51b0bba9d4dfb
2012-09-18 13:43:32 -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
Fabrice Di Meglio
d3d9f3f100 Fix bug #7173351 API REVIEW: android.util.LocaleUtil
Change-Id: I08fd491eff714059e9ec874fadebe7eb556c34d5
2012-09-18 12:55:32 -07:00
Fabrice Di Meglio
49b0a9b470 Fix bug #7172699
- remove @link as we are already using a @see which is doing a link by itself

Change-Id: I6ff6979bb2d960c3c980cdf0a88885b92e80fd7f
2012-09-18 12:06:13 -07:00
Geremy Condra
00bc4c0b67 Merge "Initial commit for X509TrustManagerExtensions." into jb-mr1-dev 2012-09-18 11:39:14 -07:00