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

84985 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
bb0aebe657 am 688ca470: Merge "Fixing crash in emulator due to no BluetoothAdapter. (Bug 7188166)" into jb-mr1-dev 
* commit '688ca4708bad4a7c829758449664f08be48fa246':
  Fixing crash in emulator due to no BluetoothAdapter. (Bug 7188166)
 2012-09-18 15:54:42 -07:00
Jim Miller
0699e83021 am 6eac514a: Merge "Remove trailing period from missing SIM string" into jb-mr1-dev 
* commit '6eac514a026d303bfdec34f9314debc58c3809b8':
  Remove trailing period from missing SIM string
 2012-09-18 15:54:38 -07:00
Jim Miller
44b19614e3 am 772db427: Merge "Selectively enable back button in keyguard for security screens." into jb-mr1-dev 
* commit '772db427a79fc1e81cb54f8ebead5e22edb0162d':
  Selectively enable back button in keyguard for security screens.
 2012-09-18 15:54:35 -07:00
Winson Chung
688ca4708b Merge "Fixing crash in emulator due to no BluetoothAdapter. (Bug 7188166)" into jb-mr1-dev 2012-09-18 15:34:37 -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
Jim Miller
772db427a7 Merge "Selectively enable back button in keyguard for security screens." into jb-mr1-dev 2012-09-18 15:32:04 -07:00
Irfan Sheriff
7780df7789 am 7d0882be: Merge "send connection broadcast on client disconnect" into jb-mr1-dev 
* commit '7d0882be6d7e2a434072cb0bb63cb117e73491cb':
  send connection broadcast on client disconnect
 2012-09-18 15:28:47 -07:00
Irfan Sheriff
7d0882be6d Merge "send connection broadcast on client disconnect" into jb-mr1-dev 2012-09-18 15:26:16 -07:00
Irfan Sheriff
5ef9c59fff send connection broadcast on client disconnect 
Bug: 7188646
Change-Id: I69f2c2581004b08730407930fb056cc1fe54feec
 2012-09-18 15:17:56 -07:00
Jeff Sharkey
ed1a377f80 am 6281d7cf: Merge "Multi-user MTP." into jb-mr1-dev 
* commit '6281d7cf32bdc624a9d70b2b4f5abce342558c27':
  Multi-user MTP.
 2012-09-18 15:00:33 -07:00
Fabrice Di Meglio
7822763892 am 8b3560d3: Merge "Fix bug #7172972 API REVIEW: android.graphics.drawable.Drawable" into jb-mr1-dev 
* commit '8b3560d3e68d6e596bc22b117b049e15cc7e1b3b':
  Fix bug #7172972 API REVIEW: android.graphics.drawable.Drawable
 2012-09-18 15:00:25 -07:00
Fabrice Di Meglio
8bf1cb378b am 20586fa0: Merge "Fix bug #7173351 API REVIEW: android.util.LocaleUtil" into jb-mr1-dev 
* commit '20586fa0353f63453766140b32a4778793ce2b43':
  Fix bug #7173351 API REVIEW: android.util.LocaleUtil
 2012-09-18 15:00:14 -07:00
Adam Cohen
072d35167f am 642258a2: Merge "Tweaking how settings adds keyguard widgets" into jb-mr1-dev 
* commit '642258a29b426b14da509df3a5ed912673feeb57':
  Tweaking how settings adds keyguard widgets
 2012-09-18 15:00:09 -07:00
Fabrice Di Meglio
9120d133b1 am dbed514e: Merge "Fix bug #7172699" into jb-mr1-dev 
* commit 'dbed514e137de66d19050b72ad941a687e13c9d4':
  Fix bug #7172699
 2012-09-18 14:59:59 -07:00
Jamie Gennis
232746e351 am 94998c9c: Merge "SurfaceTexture: remove call to doGLFenceWait" into jb-mr1-dev 
* commit '94998c9c4e19d5b439228646f1b283201367b7a0':
  SurfaceTexture: remove call to doGLFenceWait
 2012-09-18 14:59:38 -07:00
Andy Stadler
82d3529968 am ab3d0fd6: (-s ours) Merge "Move files to make eclipse-java happy" into jb-mr1-dev 
* commit 'ab3d0fd684eabecd6b290ef3cb9799739db04ca3':
  Move files to make eclipse-java happy
 2012-09-18 14:59:34 -07:00
Jeff Sharkey
6281d7cf32 Merge "Multi-user MTP." into jb-mr1-dev 2012-09-18 14:52:46 -07:00
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 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
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