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

85131 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabrice Di Meglio
8b3560d3e6 Merge "Fix bug #7172972 API REVIEW: android.graphics.drawable.Drawable" into jb-mr1-dev 2012-09-18 14:50:47 -07:00
Chet Haase
8bcfe1bf25 am 48618c98: Merge "Fix GL shader bugs" into jb-mr1-dev 
* commit '48618c987eed656bf3d8baa6ce25b7f5d3f4a43e':
  Fix GL shader bugs
 2012-09-18 14:49:55 -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
Winson Chung
84dbf462f8 Fixing crash in emulator due to no BluetoothAdapter. (Bug 7188166) 
Change-Id: I63fe4b229a8a460170df153e71b7ad65655dfad1
 2012-09-18 14:48:00 -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
Andy Stadler
ab3d0fd684 Merge "Move files to make eclipse-java happy" into jb-mr1-dev 2012-09-18 14:20:30 -07:00
Chet Haase
48618c987e Merge "Fix GL shader bugs" into jb-mr1-dev 2012-09-18 14:13:57 -07:00
Chet Haase
0990ffbc4d Fix GL shader bugs 
Fixing errors in emitted shader code that caused GL errors
at runtime

Change-Id: I267a84398a81329a6688b292505f8779bd750ad1
 2012-09-18 14:10:10 -07:00
Andy Stadler
d44daaba44 Move files to make eclipse-java happy 
No changes to text at all, just moving the java files to match their
declared packages.

There was no original bug# but this cleans up the code submitted in
the original Change-Id: I42307f58074157b33b6e01216aab10022340d449

Change-Id: I233fa7f21167a42565aadb7ad109600b1a1a5721
 2012-09-18 14:08:30 -07:00
Geremy Condra
db85bee3e6 am cdf964ea: Merge "Fix bad isinstance check in X509TrustManagerExtensions and add test." into jb-mr1-dev 
* commit 'cdf964eab3cb9381745886f35b8c5a73ba61e28d':
  Fix bad isinstance check in X509TrustManagerExtensions and add test.
 2012-09-18 14:04:14 -07:00
Christopher Tate
e52acb963b am 6b58fde9: Merge "Settings provider needs to send notifications as itself" into jb-mr1-dev 
* commit '6b58fde99a2c78e4ef66679dd62eb29848e9a9f7':
  Settings provider needs to send notifications as itself
 2012-09-18 14:04:10 -07:00
Daniel Sandler
eec97160e4 am 63bcc14c: Merge "Remove settings and rotation buttons from notification panel." into jb-mr1-dev 
* commit '63bcc14c433b754c234bb593e6fdeaf08db1b106':
  Remove settings and rotation buttons from notification panel.
 2012-09-18 14:04:04 -07:00
Jason Sams
5268ab0599 am a2163607: Merge "Add Kernel, Method, and field IDs bug 7182873" into jb-mr1-dev 
* commit 'a21636074aee3a4291ba3bb7b0eb038dfeccfbb5':
  Add Kernel, Method, and field IDs bug 7182873
 2012-09-18 14:03:48 -07:00
Irfan Sheriff
104212aa7a am 24ed2769: Merge "WFD fixes" into jb-mr1-dev 
* commit '24ed2769130a8f9df44e7fc22be52b6282e724c3':
  WFD fixes
 2012-09-18 14:03:36 -07:00
Geremy Condra
cdf964eab3 Merge "Fix bad isinstance check in X509TrustManagerExtensions and add test." into jb-mr1-dev 2012-09-18 13:47:17 -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
Fabrice Di Meglio
f358260af4 Fix bug #7172972 API REVIEW: android.graphics.drawable.Drawable 
- add @hide

Change-Id: I20dca8d7f6a58dfd1dd342135dcff912e08d4ab9
 2012-09-18 13:38:53 -07:00
Christopher Tate
6b58fde99a Merge "Settings provider needs to send notifications as itself" into jb-mr1-dev 2012-09-18 13:35:59 -07:00
Daniel Sandler
63bcc14c43 Merge "Remove settings and rotation buttons from notification panel." into jb-mr1-dev 2012-09-18 13:33:21 -07:00
Christopher Tate
c8459dc85e Settings provider needs to send notifications as itself 
... and not as its ultimate caller, who may be a less-privileged
application.  Fixes bug 7188309

Change-Id: Iffd37b8da84f683bf665bf3d48c0b7fbc8dd721d
 2012-09-18 13:27:36 -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
Jason Sams
a21636074a Merge "Add Kernel, Method, and field IDs bug 7182873" into jb-mr1-dev 2012-09-18 13:24:56 -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
Jason Sams
08a81583c1 Add Kernel, Method, and field IDs 
bug 7182873

Change-Id: I066a359bb04027e9376dac088560f042c496b10e
 2012-09-18 12:32:10 -07:00
Irfan Sheriff
24ed276913 Merge "WFD fixes" into jb-mr1-dev 2012-09-18 12:22:06 -07:00
Irfan Sheriff
e0c28d5f13 WFD fixes 
- Specificy max GO intent for WFD
- Increase GO idle time out to 20s and use it for GO and client
- Fix connection broadcast

Change-Id: Ia0e28bc9eb3e23d2830a6c814c5a537ca0bcd5db
 2012-09-18 12:20:37 -07:00
Geremy Condra
7c041de3ef am 00bc4c0b: Merge "Initial commit for X509TrustManagerExtensions." into jb-mr1-dev 
* commit '00bc4c0b6723bda12e846f9f1f729acb79a389a1':
  Initial commit for X509TrustManagerExtensions.
 2012-09-18 12:16:51 -07:00
Mike Lockwood
ed8ba7e786 am 465d7207: am ad23333f: am 945080b5: am 1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT" 
* commit '465d72073c6d47a27b51d384bd9e019faa7957c1':
  MtpData bmp format file can't recognize when copy bmp into DUT
 2012-09-18 12:16:21 -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
Scott Main
8be385b882 am c95b1d88: am a59b1dac: am edf0ba6e: am 44204020: cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages 
* commit 'c95b1d88477f5cd3abd6481e73a4185417e4a0bd':
  cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages
 2012-09-18 11:04:19 -07:00
Scott Main
5365c556a3 am 0f38c088: am 3ce6b008: am d67459ff: new Google Play badges and some updates to corresponding pages 
* commit '0f38c0887cf92e1dd57e8149b2ca5ef8f586e947':
  new Google Play badges and some updates to corresponding pages
 2012-09-18 11:04:15 -07:00
Scott Main
bc778762a1 am bc95e937: am fe7e473d: am b574a264: am b86b7f07: small update to the ADT installation steps based on new ADT UI 
* commit 'bc95e937bfb4f484c7e774bf1a0ae68d59666204':
  small update to the ADT installation steps based on new ADT UI
 2012-09-18 11:04:10 -07:00
Katie McCormick
e520daada0 am 79d977ba: am 04afdd68: am ad4bbdf2: am 844d2a94: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link 
* commit '79d977ba1f13e4fab005d0efab7b1fd7e0630de4':
  Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
 2012-09-18 11:04:07 -07:00
Scott Main
408e86e927 am 4ca7f559: am 6c47d0a9: am ada4f081: am 61d85c43: add link to device dock lesson 
* commit '4ca7f5594b2c618f1d818c74d5c0b02c38e2597b':
  add link to device dock lesson
 2012-09-18 11:04:03 -07:00
Dirk Dougherty
4efa15dcae am e7b57110: am 880051db: am 2dec9928: am 24a024ec: Doc change: fix typo in JB highlights. 
* commit 'e7b571105436e4272cfe96ed015f4b4f952c9738':
  Doc change: fix typo in JB highlights.
 2012-09-18 11:04:00 -07:00
Scott Main
11b0799d9e am 81ae8e7d: am 08ec998b: am a1981bc1: am d5abc558: docs: update for multi apk doc for ABI support 
* commit '81ae8e7d0a4bac4390fa046cfb142dd3e43f5b6e':
  docs: update for multi apk doc for ABI support
 2012-09-18 11:03:57 -07:00
Katie McCormick
37d2dd5baa am 7e26ef6b: am 0a94b84d: am 917d45e3: am 73ec048e: Doc update: Appwidgets JB additions. 
* commit '7e26ef6bbe3acbaa27d7beb13ff1fb9bc5ba960f':
  Doc update: Appwidgets JB additions.
 2012-09-18 11:03:54 -07:00
Scott Main
076448653a am ebeb95bf: am 21c5007e: am 8a80ac46: am 54efa69f: older not lower 
* commit 'ebeb95bf47fbe4fdf6e882c656375a89ed5f4fef':
  older not lower
 2012-09-18 11:03:51 -07:00
Joe Fernandez
3060872886 am e3c672cb: am 77ae2e6f: am b9b05dfc: am 8982939d: docs: Accessibility DevGuide, Jelly Bean edition 
* commit 'e3c672cb07ee80b47f5021db2ffa5f5658dbd7e5':
  docs: Accessibility DevGuide, Jelly Bean edition
 2012-09-18 11:03:47 -07:00
Scott Main
70f498efdb am 9ecfb8d1: am db6313ce: am 0cc7398a: am d46023d2: (-s ours) dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts 
* commit '9ecfb8d1187ecbc7116411de9a6ecf3025aa7646':
  dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
 2012-09-18 11:03:44 -07:00
Katie McCormick
5f98bba363 am f7e2e400: am f5c717a9: am 2141c068: am 243170f7: Doc update: Fix typo. 
* commit 'f7e2e400792a89ad7c94ddf2db81cbafffa40b17':
  Doc update: Fix typo.
 2012-09-18 11:03:41 -07:00
Scott Main
1c9a5c92b0 am 963b2505: am 5c97d966: am 9ae01846: fix broken link for action bar pack 
* commit '963b2505b97ec3e9f7277c84059058c64d36f49e':
  fix broken link for action bar pack
 2012-09-18 11:03:38 -07:00