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

34465 Commits

Author SHA1 Message Date
Geremy Condra
24c23fb02f am ad793427: Merge "Code cleanup for X509TrustManagerExtensionsTest.java" into jb-mr1-dev 
* commit 'ad79342786f989a9b478be52b1a06272c28574ec':
  Code cleanup for X509TrustManagerExtensionsTest.java
 2012-09-18 15:54:47 -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
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
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
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
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
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
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
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
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
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
8bf2f772a6 am b250e94f: Merge "Fix bug #7112174 ActionMenuView should be aware of layout direction" into jb-mr1-dev 
* commit 'b250e94fdced2bd753eeb75f378abfab8b17cc2c':
  Fix bug #7112174 ActionMenuView should be aware of layout direction
 2012-09-18 10:56:02 -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
fea6a7597f am a4b0e559: Merge "Use a larger scaling span for larger screen devices." into jb-mr1-dev 
* commit 'a4b0e5590dc303df68256254f732ef632e6912f3':
  Use a larger scaling span for larger screen devices.
 2012-09-18 10:44:24 -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
Adam Powell
8b1821979b Use a larger scaling span for larger screen devices. 
Change-Id: I67486e65799c076fc9ac150f67a6be715c2ed4d0
 2012-09-18 10:23:43 -07:00
Andy McFadden
e8792ce854 am 923c18b1: Merge "Plumb display name into SurfaceFlinger" into jb-mr1-dev 
* commit '923c18b1421296c2ed37a51d055283e94f99fc53':
  Plumb display name into SurfaceFlinger
 2012-09-18 10:03:55 -07:00
Andy McFadden
923c18b142 Merge "Plumb display name into SurfaceFlinger" into jb-mr1-dev 2012-09-18 09:23:30 -07:00
Amith Yamasani
7d43c417b6 am f7a6dfca: Merge "Pass Bitmap instead of ParcelFileDescriptor in UserManager" into jb-mr1-dev 
* commit 'f7a6dfcafc1eaa8014b4fa796e4b31208f72fd36':
  Pass Bitmap instead of ParcelFileDescriptor in UserManager
 2012-09-17 22:54:56 -07:00
Amith Yamasani
f7a6dfcafc Merge "Pass Bitmap instead of ParcelFileDescriptor in UserManager" into jb-mr1-dev 2012-09-17 22:53:21 -07:00
Amith Yamasani
e928d7d95d Pass Bitmap instead of ParcelFileDescriptor in UserManager 
Add a USER_INFO_CHANGED intent for lockscreen and quicksettings to use
to monitor changes to the user name or icon.

Bug: 7164040
Change-Id: Id6fb8b6d38ce04ccd02bbadcf0c10699783d6c03
 2012-09-17 21:46:51 -07:00
Irfan Sheriff
196813cf9f am 5bc09e26: Merge "Disable notification scans when p2p is connected" into jb-mr1-dev 
* commit '5bc09e2683202856d2a1ee50c93965895c2e6a2e':
  Disable notification scans when p2p is connected
 2012-09-17 21:03:24 -07:00
Irfan Sheriff
5bc09e2683 Merge "Disable notification scans when p2p is connected" into jb-mr1-dev 2012-09-17 20:58:42 -07:00
Irfan Sheriff
3809f500c3 Disable notification scans when p2p is connected 
Also reduce scan interval for STA scans to one minute.

Bug: 7138968
Change-Id: I03620f6d462e4ec90d9bb25bbfe709f63173df21
 2012-09-17 20:52:23 -07:00
Jamie Gennis
917a3b34a3 SurfaceTexture: remove call to doGLFenceWait 
This call is no longer needed as the default behavior of the native
SurfaceTexture class is to do the wait whenever updateTexImage is called.

Change-Id: I995686a5989409e21b00fac913bd33c11f806998
 2012-09-17 19:00:19 -07:00
Andy McFadden
3bcbad7bcb Plumb display name into SurfaceFlinger 
Pass the display name into SF's createDisplay().

Bug 7058158

Change-Id: Ia21f07063db2c2fb5a34d6526e16d4b2d3694377
 2012-09-17 18:32:40 -07:00
Eric Laurent
a3a58ff13a am 21dfd7c5: Merge "Update headphone volume safety warning message." into jb-mr1-dev 
* commit '21dfd7c5fe9e42d2ef3ac7423065c86dfe8f29da':
  Update headphone volume safety warning message.
 2012-09-17 18:30:54 -07:00
Eric Laurent
21dfd7c5fe Merge "Update headphone volume safety warning message." into jb-mr1-dev 2012-09-17 18:29:27 -07:00
Dianne Hackborn
d2011dcdc4 am c33f94e2: Merge "Fix API review bugs." into jb-mr1-dev 
* commit 'c33f94e2a50c9b03cb771237e8672743da8b1314':
  Fix API review bugs.
 2012-09-17 18:25:00 -07:00
Dianne Hackborn
c33f94e2a5 Merge "Fix API review bugs." into jb-mr1-dev 2012-09-17 18:22:38 -07:00
Romain Guy
79990bf8cf am 82f385a3: Merge "Add extra EGL error checking" into jb-mr1-dev 
* commit '82f385a372329b767876ace2b3715a2d8ec13221':
  Add extra EGL error checking
 2012-09-17 18:22:33 -07:00
Romain Guy
82f385a372 Merge "Add extra EGL error checking" into jb-mr1-dev 2012-09-17 18:20:55 -07:00
Romain Guy
740ee65d46 Add extra EGL error checking 
Change-Id: I7cacef41ed08118c5eecf674e3d8461473692968
 2012-09-17 18:11:40 -07:00
Michael Jurka
94671c315d am 2bb25cd5: Merge "Fixing construction of handler in AppWidgetHost" into jb-mr1-dev 
* commit '2bb25cd57ae540160fa2fff2b929b68c448423a9':
  Fixing construction of handler in AppWidgetHost
 2012-09-17 18:04:55 -07:00
Michael Jurka
2bb25cd57a Merge "Fixing construction of handler in AppWidgetHost" into jb-mr1-dev 2012-09-17 18:03:06 -07:00
Christopher Tate
d384c507ac am f1aa107b: Merge "Per-user content observer APIs" into jb-mr1-dev 
* commit 'f1aa107b183189d65315d152148dc96b48f6e4b0':
  Per-user content observer APIs
 2012-09-17 17:36:08 -07:00
Christopher Tate
f1aa107b18 Merge "Per-user content observer APIs" into jb-mr1-dev 2012-09-17 17:34:00 -07:00