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

25502 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Amith Yamasani
5d6d74202f am a6760474: am f7a6dfca: Merge "Pass Bitmap instead of ParcelFileDescriptor in UserManager" into jb-mr1-dev 
* commit 'a6760474f751a1b9659f7a932a8debb09068fbe9':
  Pass Bitmap instead of ParcelFileDescriptor in UserManager
 2012-09-18 00:10:31 -07:00
Irfan Sheriff
ed9f9f2569 am caef59af: am 5bc09e26: Merge "Disable notification scans when p2p is connected" into jb-mr1-dev 
* commit 'caef59afdda60b5d16a74fffdb98947b1e56fdb1':
  Disable notification scans when p2p is connected
 2012-09-18 00:10:23 -07:00
Eric Laurent
b653ec8388 am c250e1ed: am 21dfd7c5: Merge "Update headphone volume safety warning message." into jb-mr1-dev 
* commit 'c250e1ed699864462ed1ace5dea22e09f117515b':
  Update headphone volume safety warning message.
 2012-09-18 00:10:08 -07:00
Dianne Hackborn
fb67743848 am 20f8c730: am c33f94e2: Merge "Fix API review bugs." into jb-mr1-dev 
* commit '20f8c730a4d83a01ac92fc3f82129d523b4bc3ef':
  Fix API review bugs.
 2012-09-18 00:10:04 -07:00
Romain Guy
524a6d9cdf am 41dbb6fe: am 82f385a3: Merge "Add extra EGL error checking" into jb-mr1-dev 
* commit '41dbb6fe3545b986c4587a29da7db398c21e3f82':
  Add extra EGL error checking
 2012-09-18 00:10:01 -07:00
Michael Jurka
3e98a33122 am 8075d7fa: am 2bb25cd5: Merge "Fixing construction of handler in AppWidgetHost" into jb-mr1-dev 
* commit '8075d7fa62c65fec67c80c0b451be1e051fa568a':
  Fixing construction of handler in AppWidgetHost
 2012-09-18 00:09:57 -07:00
Christopher Tate
012bdf5406 am 1c9f740a: am f1aa107b: Merge "Per-user content observer APIs" into jb-mr1-dev 
* commit '1c9f740adbee3ddcfd163ea030415630f277c950':
  Per-user content observer APIs
 2012-09-18 00:09:50 -07:00
Adam Powell
f307cb23f0 am 52761d23: am 49a22f29: Merge "TaskStackBuilder correctness fixes" into jb-mr1-dev 
* commit '52761d23b0b344778ae9791515c11da4d25e17e8':
  TaskStackBuilder correctness fixes
 2012-09-18 00:09:42 -07:00
Dianne Hackborn
560f555c43 am c0b59093: am 4246f695: Merge "Try again to fix issue #6912004:tap on gmail notification sends me to home screen" into jb-mr1-dev 
* commit 'c0b590932d611e842836d1662a4baa4812d07b21':
  Try again to fix issue #6912004:tap on gmail notification sends me to home screen
 2012-09-18 00:09:31 -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
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
Eric Laurent
21dfd7c5fe Merge "Update headphone volume safety warning message." into jb-mr1-dev 2012-09-17 18:29:27 -07:00
Dianne Hackborn
c33f94e2a5 Merge "Fix API review bugs." into jb-mr1-dev 2012-09-17 18:22:38 -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
2bb25cd57a Merge "Fixing construction of handler in AppWidgetHost" into jb-mr1-dev 2012-09-17 18:03:06 -07:00
Christopher Tate
f1aa107b18 Merge "Per-user content observer APIs" into jb-mr1-dev 2012-09-17 17:34:00 -07:00
Michael Jurka
e6d5545a53 Fixing construction of handler in AppWidgetHost 
Change-Id: I1253f8e2ea1621208ad7d65e5c860a1df075a44a
 2012-09-17 17:30:16 -07:00
Dianne Hackborn
8832c18d8b Fix API review bugs. 
7173152 API REVIEW: android.content.pm.PackageUserState
7172969 API REVIEW: android.app.PendingIntent
7172730 API REVIEW: android.content.Context
7172726 API REVIEW: android.manifest.permission

Change-Id: Iad470256d3b5ca5596487f6a699ec1871457c3b5
 2012-09-17 17:27:15 -07:00
Adam Powell
49a22f2969 Merge "TaskStackBuilder correctness fixes" into jb-mr1-dev 2012-09-17 17:15:09 -07:00
Eric Laurent
b6397c7170 Update headphone volume safety warning message. 
Change-Id: Ic2d5d9d247b76b6ede0f90b861c235c1c0f5dc08
 2012-09-17 16:59:19 -07:00
Christopher Tate
16aa973617 Per-user content observer APIs 
Callers with INTERACT_ACROSS_USERS_FULL permission can now observe content
for a given user's view (and can notify content uri changes targeted to a
specific user).  An observer watching for UserHandle.USER_ALL will see all
notifications for the given uri across all users; similarly, a notifier
who specifies USER_ALL will broadcast the change to all observers across
all users.

The API handles both USER_ALL or USER_CURRENT, and explicitly forbids
any other "pseudouser" designations.

This CL also revs the Settings provider to notify with USER_ALL for
changes to global settings, and with only the affected user's handle
for all other changes.

Bug 7122169

Change-Id: I94248b11aa91d1beb0a36432e82fe5725bb1264f
 2012-09-17 16:35:36 -07:00
Dianne Hackborn
4246f695f4 Merge "Try again to fix issue #6912004:tap on gmail notification sends me to home screen" into jb-mr1-dev 2012-09-17 16:19:14 -07:00