Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,133 Commits 3 Branches 0 Tags
d66228d83f09af8dfb76965b8317c707c78cec32
Commit Graph

27629 Commits

Author SHA1 Message Date
Dianne Hackborn
4786223a08 am 7788b759: am 52716deb: Merge "Fix deadlock in LockPatternUtils by using local id." into jb-mr1-dev 
* commit '7788b759726f4c3c004075ac5c5977f6e4c82fe0':
  Fix deadlock in LockPatternUtils by using local id.
 2012-09-19 15:21:35 -07:00
Craig Mautner
b74d9f8285 am 18f42668: am 8f301e66: Merge "Add debug for b/7094175." into jb-mr1-dev 
* commit '18f42668e44edf75f4cbf096966943b4a1b267b2':
  Add debug for b/7094175.
 2012-09-19 15:21:31 -07:00
Christopher Tate
7d295bdae4 am 43b69c75: am a1c46636: Merge "Disable content observer cross-user permission checks..." into jb-mr1-dev 
* commit '43b69c7580169851ef1fe84af23674ed3b54ca1a':
  Disable content observer cross-user permission checks...
 2012-09-19 15:21:28 -07:00
Dianne Hackborn
1a30458a0b am a553eeaf: am 390392ff: Merge "Changes to support side-loading of apps from other users." into jb-mr1-dev 
* commit 'a553eeaf877457cdacceb401529201a40223e64c':
  Changes to support side-loading of apps from other users.
 2012-09-19 15:21:17 -07:00
Adam Powell
7962fd36fc am d1f13586: am 10bd4106: am baed0a8f: am 56fd88d8: am ab12f0f7: Merge "Implement resolving of icon attributes to resIds in AlertController" 
* commit 'd1f135869e1e89348ea9d1ee916749e30933fe7f':
  Implement resolving of icon attributes to resIds in AlertController
 2012-09-19 15:21:04 -07:00
Fabrice Di Meglio
6f7f916ae6 am d02341d0: am 072533e9: Merge "Fix bug #7146516 Padding can be "over" resolved" into jb-mr1-dev 
* commit 'd02341d0bd4a7a36bc7b9c991ed47d6f98a756ee':
  Fix bug #7146516 Padding can be "over" resolved
 2012-09-19 15:21:00 -07:00
Fabrice Di Meglio
ea19ae20db am eebe7df2: am efa56852: Merge "Fix some typos in Javadoc for Accessibility APIs" into jb-mr1-dev 
* commit 'eebe7df2a37520bc97f9fc8025827d46fb22b32b':
  Fix some typos in Javadoc for Accessibility APIs
 2012-09-19 15:20:57 -07:00
Dianne Hackborn
79c8c7a4ff am 9b4d528d: am 09ad0832: Merge "Switch to showing top-most thumbnail of recent apps." into jb-mr1-dev 
* commit '9b4d528d7edf3d55a925b79ab7ba7664a9cb7a5e':
  Switch to showing top-most thumbnail of recent apps.
 2012-09-19 15:20:41 -07:00
Jeff Sharkey
d3800acea5 am f40a2ba1: am a490bddc: Merge changes I4513afbd,I20e2194c into jb-mr1-dev 
* commit 'f40a2ba1469304b44097d40c526f1bc9500ded93':
  Make getMediaStorageDirectory() user-aware.
  Lockdown should only augment connected networks.
 2012-09-19 15:20:32 -07:00
Narayan Kamath
ec0e97fe7a am 40c5a7a6: am 5d1a870a: Merge "Add APIs to enable SNI and session tickets on sockets." into jb-mr1-dev 
* commit '40c5a7a6e14447bbe66e6daeca7e992bcf200012':
  Add APIs to enable SNI and session tickets on sockets.
 2012-09-19 15:19:38 -07:00
Irfan Sheriff
6ad0da54a8 am 74f4997c: am 5d4206a5: Merge "Get strings in" into jb-mr1-dev 
* commit '74f4997ca467bda930e1c270f82731e66666999c':
  Get strings in
 2012-09-19 15:19:08 -07:00
Amith Yamasani
dc5b1dd508 am 728f3193: am 4adb9d34: Merge "DevicePolicyManager per user" into jb-mr1-dev 
* commit '728f3193efbdacc81442f7cdcfc49d3c8804e5ee':
  DevicePolicyManager per user
 2012-09-19 15:18:46 -07:00
Adam Powell
5b76cede6b am 3179154c: am 98c370e7: Merge "Make invalidateOptionsMenu asynchronous" into jb-mr1-dev 
* commit '3179154c367ace1deb56340a641a7ebc53ba5e82':
  Make invalidateOptionsMenu asynchronous
 2012-09-19 15:18:17 -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
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
6f3fd45b3c am fe013183: am 6d4e887d: Merge "Move X509TrustManagerExtensions to correct directory" into jb-mr1-dev 
* commit 'fe0131839214ce6251def672bba0855e395ed54f':
  Move X509TrustManagerExtensions to correct directory
 2012-09-18 17:58:05 -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
570fa75f71 am fa0fea91: am 9ffc6047: Merge "Fix bug #7173155 API REVIEW: android.view.View" into jb-mr1-dev 
* commit 'fa0fea917f1cd08b68f69495ac5c05de584dc825':
  Fix bug #7173155 API REVIEW: android.view.View
 2012-09-18 15:49:23 -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
Jeff Sharkey
3611eacaaa am e339f025: am 6281d7cf: Merge "Multi-user MTP." into jb-mr1-dev 
* commit 'e339f025e44558e251ac67fc3f3d5c909264adfc':
  Multi-user MTP.
 2012-09-18 15:33:23 -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
Fabrice Di Meglio
ad31d027ca am 684f1078: am 20586fa0: Merge "Fix bug #7173351 API REVIEW: android.util.LocaleUtil" into jb-mr1-dev 
* commit '684f10788707f154e54a614b2d60cc28542aee3a':
  Fix bug #7173351 API REVIEW: android.util.LocaleUtil
 2012-09-18 14:59:00 -07:00
Adam Cohen
5eccd5e703 am b3e98d2a: am 642258a2: Merge "Tweaking how settings adds keyguard widgets" into jb-mr1-dev 
* commit 'b3e98d2a1b0594595d7054c74fe157504dedaf2b':
  Tweaking how settings adds keyguard widgets
 2012-09-18 14:58:56 -07:00
Fabrice Di Meglio
bceecf56a3 am 7dc062a9: am dbed514e: Merge "Fix bug #7172699" into jb-mr1-dev 
* commit '7dc062a96217f6e82c77de73a6679d23718c5f11':
  Fix bug #7172699
 2012-09-18 14:58:50 -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