drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,061 Commits 1 Branch 0 Tags
Commit Graph

34847 Commits

Author SHA1 Message Date
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
1587a6531f am 6837fc34: am 2a81fe68: Merge "Further tune config_minScalingSpan for small screen devices." into jb-mr1-dev 
* commit '6837fc3442b552775d9a657ad943569d8221c35a':
  Further tune config_minScalingSpan for small screen devices.
 2012-09-19 15:18:26 -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
Baligh Uddin
5d90374016 Merge "Import translations. DO NOT MERGE" 2012-09-19 12:36:48 -07:00
Derek Sollenberger
2a6ecae93d Fix Skia assertions where we were allowing immutable bitmaps to be written to. 
bug: 7092330
Change-Id: I4a9d1d299244d46172562080c56c8360f5e4af02
 2012-09-19 07:21: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
Amith Yamasani
4adb9d3416 Merge "DevicePolicyManager per user" into jb-mr1-dev 2012-09-18 20:00:44 -07:00
Adam Powell
2a81fe68c2 Merge "Further tune config_minScalingSpan for small screen devices." into jb-mr1-dev 2012-09-18 18:49:32 -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
6d4e887da4 Merge "Move X509TrustManagerExtensions to correct directory" into jb-mr1-dev 2012-09-18 17:51:09 -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
Jim Miller
65c4227e97 am 29a1b604: am 402f0c81: Merge "Refactor Carrier text as a movable module." into jb-mr1-dev 
* commit '29a1b604cceb302da4b1636af337bb7551dccac8':
  Refactor Carrier text as a movable module.
 2012-09-18 17:16:56 -07:00
Jim Miller
402f0c8123 Merge "Refactor Carrier text as a movable module." into jb-mr1-dev 2012-09-18 17:00:38 -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
Geremy Condra
9242dfc635 am 93296d23: am ad793427: Merge "Code cleanup for X509TrustManagerExtensionsTest.java" into jb-mr1-dev 
* commit '93296d23c87059a2dfda09df92e1f902f4f6766b':
  Code cleanup for X509TrustManagerExtensionsTest.java
 2012-09-18 15:46:17 -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
Jim Miller
c5f59eea79 am 65e1922a: am 6eac514a: Merge "Remove trailing period from missing SIM string" into jb-mr1-dev 
* commit '65e1922ae6614e34120153cd137190fc1fd30759':
  Remove trailing period from missing SIM string
 2012-09-18 15:41:18 -07:00
Geremy Condra
ad79342786 Merge "Code cleanup for X509TrustManagerExtensionsTest.java" into jb-mr1-dev 2012-09-18 15:37:22 -07:00
Jim Miller
6eac514a02 Merge "Remove trailing period from missing SIM string" into jb-mr1-dev 2012-09-18 15:33:49 -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
Jamie Gennis
61a82a116a am ca10e561: am 94998c9c: Merge "SurfaceTexture: remove call to doGLFenceWait" into jb-mr1-dev 
* commit 'ca10e561a396049adb9c8e6cb961dace20d72bb7':
  SurfaceTexture: remove call to doGLFenceWait
 2012-09-18 14:55:53 -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 Powell
aff9d529b5 Further tune config_minScalingSpan for small screen devices. 
Bug 7189429

Change-Id: Ia031551d2e1cd2569d21ce4901b454866c4d88c3
 2012-09-18 14:46:56 -07:00
Geremy Condra
fd5a80f6e9 Code cleanup for X509TrustManagerExtensionsTest.java 
Change-Id: I85584f7a9dbc726be811f783d125efcf70c9f6af
 2012-09-18 14:44:54 -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
Jamie Gennis
94998c9c4e Merge "SurfaceTexture: remove call to doGLFenceWait" into jb-mr1-dev 2012-09-18 14:32:01 -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
13f9a21c87 am afc4fba7: am cdf964ea: Merge "Fix bad isinstance check in X509TrustManagerExtensions and add test." into jb-mr1-dev 
* commit 'afc4fba7cc97ab90c58f19ca42c0ecdfc3b6d942':
  Fix bad isinstance check in X509TrustManagerExtensions and add test.
 2012-09-18 13:59:51 -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
Geremy Condra
0409186f25 am b02e3df0: am 00bc4c0b: Merge "Initial commit for X509TrustManagerExtensions." into jb-mr1-dev 
* commit 'b02e3df01266874ddb9d3edb6674b3fe7d50b6b7':
  Initial commit for X509TrustManagerExtensions.
 2012-09-18 12:20:09 -07:00
Fabrice Di Meglio
1f6541693f am 876d8943: am b250e94f: Merge "Fix bug #7112174 ActionMenuView should be aware of layout direction" into jb-mr1-dev 
* commit '876d89434adfc809cb368e262ec5cd249a2c47b7':
  Fix bug #7112174 ActionMenuView should be aware of layout direction
 2012-09-18 12:19:14 -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
Geremy Condra
ed41a4e2d8 Initial commit for X509TrustManagerExtensions. 
This provides a mechanism for exposing the bells
and whistles we've attached to trust managers to
third parties.

Change-Id: If117ffd2240a7bf3437115f3cf2f766c4e249600
 2012-09-18 11:29:46 -07:00
Fabrice Di Meglio
b250e94fdc Merge "Fix bug #7112174 ActionMenuView should be aware of layout direction" into jb-mr1-dev 2012-09-18 10:47:07 -07:00
Adam Powell
2fafa96eda am e31634e9: am a4b0e559: Merge "Use a larger scaling span for larger screen devices." into jb-mr1-dev 
* commit 'e31634e9be7118cab710a614ab44f070712dc560':
  Use a larger scaling span for larger screen devices.
 2012-09-18 10:34:33 -07:00
Adam Powell
a4b0e5590d Merge "Use a larger scaling span for larger screen devices." into jb-mr1-dev 2012-09-18 10:25:00 -07:00