Jeff Sharkey
ef33caf85a
am 4e7b551f: Merge "Move HAS_TRANSIENT_STATE flag into a safe area." into jb-mr1-dev
...
* commit '4e7b551fbffa6112821ed6cfeedd6128463fccd0':
Move HAS_TRANSIENT_STATE flag into a safe area.
2012-09-20 06:22:39 -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
Christopher Tate
40ccfee497
am c575e007: Merge "setShowGTalkServiceStatus() is deprecated but tested by CTS" into jb-mr1-dev
...
* commit 'c575e007e59e00db7c1f3f2b2ea57cc24dd7c2de':
setShowGTalkServiceStatus() is deprecated but tested by CTS
2012-09-20 06:22:26 -07:00
John Reck
28aba6e9d4
am 4be07ade: Merge "Revert "Test aggressive throttling"" into jb-mr1-dev
...
* commit '4be07ade3658da9345067780520ddbd266900ee4':
Revert "Test aggressive throttling"
2012-09-20 06:22:05 -07:00
Jeff Sharkey
4d6ce59c5c
am 4046e012: Merge "Migrate UI to supportsMultipleUsers()." into jb-mr1-dev
...
* commit '4046e012887fff1f36dfd3eddc6f354d4c2497fc':
Migrate UI to supportsMultipleUsers().
2012-09-20 06:21:27 -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
Craig Mautner
404dc595e3
am 8f301e66: Merge "Add debug for b/7094175." into jb-mr1-dev
...
* commit '8f301e666873e4a9feaace38a0b184a5f3ce7003':
Add debug for b/7094175.
2012-09-20 06:20:25 -07:00
Christopher Tate
0d2d123336
am a1c46636: Merge "Disable content observer cross-user permission checks..." into jb-mr1-dev
...
* commit 'a1c46636dd533e889e1f3b3326fa0d851928df4f':
Disable content observer cross-user permission checks...
2012-09-20 06:20:17 -07:00
Dianne Hackborn
ba78386f79
am 390392ff: Merge "Changes to support side-loading of apps from other users." into jb-mr1-dev
...
* commit '390392ff3ef0114544eab3db4093c1c7aba825da':
Changes to support side-loading of apps from other users.
2012-09-20 06:20:13 -07:00
Fabrice Di Meglio
db7bb39b4c
am 072533e9: Merge "Fix bug #7146516 Padding can be "over" resolved" into jb-mr1-dev
...
* commit '072533e934e759b95228ba61152e7d958b641b96':
Fix bug #7146516 Padding can be "over" resolved
2012-09-20 06:19:55 -07:00
Fabrice Di Meglio
a84d8ad3ba
am efa56852: Merge "Fix some typos in Javadoc for Accessibility APIs" into jb-mr1-dev
...
* commit 'efa568525fc7755ac49e44e75246b2be1ef5269f':
Fix some typos in Javadoc for Accessibility APIs
2012-09-20 06:19:52 -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
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
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 c7c85b34da
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
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
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
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
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
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
171fa7f2c5
am 98c370e7: Merge "Make invalidateOptionsMenu asynchronous" into jb-mr1-dev
...
* commit '98c370e71d93ed2704018e2bc3455f00c08821a9':
Make invalidateOptionsMenu asynchronous
2012-09-18 18:47:17 -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
2e16d61257
am 6d4e887d: Merge "Move X509TrustManagerExtensions to correct directory" into jb-mr1-dev
...
* commit '6d4e887da4c8f2f0e246afd7961e2b2df0cc1aa4':
Move X509TrustManagerExtensions to correct directory
2012-09-18 17:54:36 -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
Fabrice Di Meglio
eef4e625d3
am 9ffc6047: Merge "Fix bug #7173155 API REVIEW: android.view.View" into jb-mr1-dev
...
* commit '9ffc6047f14883f853b643a2913bd590995b9031':
Fix bug #7173155 API REVIEW: android.view.View
2012-09-18 15:54:55 -07:00
Jeff Sharkey
3fe5bf6d69
Make getMediaStorageDirectory() user-aware.
...
Bug: 7173591
2012-09-18 15:54:52 -07:00
