Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
86,956 Commits 3 Branches 0 Tags
bceecf56a349bc39aa5bb329ac94bb082c243bf6
Commit Graph

27573 Commits

Author SHA1 Message Date
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
Fabrice Di Meglio
dbed514e13 Merge "Fix bug #7172699" into jb-mr1-dev 2012-09-18 14:46:59 -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
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
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
Adam Powell
75e0af8982 TaskStackBuilder correctness fixes 
* Don't mutate original intents when adding default flags.

* Add the relevant flags to the array returned by getIntents() such
  that it can be used directly in a call to startActivities or
  similar.

* Deep copy the component intents when building an intent array for
  getIntents()

* Clean up some internal code duplication

Change-Id: I71d3b7f30d4f7d8f1cce778d406ea0e513d382c5
 2012-09-17 16:16:55 -07:00
Dianne Hackborn
ad9b32115b Try again to fix issue #6912004:tap on gmail notification sends me to home screen 
Add a new call to the activity manager to tell it when the activity
is resumed, so it can mark its state as dirty then instead of when
it first tries to create it.

Also tweak things to update the LRU list for the upcoming activity
at the point we start pausing the current activity, to avoid an
inefficiency where we may decide to kill the process of the upcoming
activity if it is at the end of the LRU list.

Change-Id: Ia6dc8c34dc6d4b085a1efbe3a5d5f47721d55078
 2012-09-17 16:03:22 -07:00
Philip Milne
417e267a75 Merge "Revert "Simple MVC based binding mechanism for android controls." Do not merge." into jb-mr1-dev 2012-09-17 15:47:11 -07:00
Victoria Lease
b19f313e25 am 976ed471: am d6991106: Merge "Avert crash when dragging text in same TextView" into jb-mr1-dev 
* commit '976ed4711ef5fc943ad94a8cbb251cd5feb34cde':
  Avert crash when dragging text in same TextView
 2012-09-17 15:12:05 -07:00
Victoria Lease
d6991106b0 Merge "Avert crash when dragging text in same TextView" into jb-mr1-dev 2012-09-17 15:08:07 -07:00
Elliott Hughes
af73eb8526 am 45b09c00: am 7134ef60: Merge "Fix date formatting for fa locales." into jb-mr1-dev 
* commit '45b09c0044893e9b549de0eeb20a925a8549cd52':
  Fix date formatting for fa locales.
 2012-09-17 14:55:09 -07:00
Adam Powell
3e8190d913 am 3987a032: am e01538f2: Merge "TaskStackBuilder - use the correct package for looking up parents" into jb-mr1-dev 
* commit '3987a03261785cbbca92f247635708d23c84ff5c':
  TaskStackBuilder - use the correct package for looking up parents
 2012-09-17 14:54:28 -07:00
Chet Haase
9c16ed747a am ee6113a6: am f74d2f2f: Merge "Fix occasional crash bug with layers" into jb-mr1-dev 
* commit 'ee6113a62099e079df9ffa1b173feb728d08c191':
  Fix occasional crash bug with layers
 2012-09-17 14:54:15 -07:00
Amith Yamasani
4a1e7e3c59 am 83385ecc: am e645324e: Merge "Add UserManager.getUserIcon()" into jb-mr1-dev 
* commit '83385eccc5274443d90d4c4dc821e6281fee4af6':
  Add UserManager.getUserIcon()
 2012-09-17 14:54:05 -07:00
Eino-Ville Talvala
c5eb2b5d90 am 978f5c6a: am b181909e: Merge "Camera: Document face detection confidence recommendations." into jb-mr1-dev 
* commit '978f5c6a2c3c6088ff77fbe84fbf3976b631346b':
  Camera: Document face detection confidence recommendations.
 2012-09-17 14:52:49 -07:00
Eric Laurent
1eb6f0f84b am 0d2c4fb0: am 39a37c3b: Merge "headphone volume limitation" into jb-mr1-dev 
* commit '0d2c4fb08a8225909295c10602c83f63aa155f95':
  headphone volume limitation
 2012-09-17 14:46:28 -07:00
Dianne Hackborn
00c4b0c015 am 86fa4926: am 8406d05b: Merge "New uninstall option to uninstall for all users." into jb-mr1-dev 
* commit '86fa49265e8df22e444e36717a956a3470352e7b':
  New uninstall option to uninstall for all users.
 2012-09-17 14:45:58 -07:00
Elliott Hughes
7134ef60b7 Merge "Fix date formatting for fa locales." into jb-mr1-dev 2012-09-17 14:45:42 -07:00
Dianne Hackborn
0ab7308e99 am 831f31c3: am b137c806: Merge "More adjustments to permissions." into jb-mr1-dev 
* commit '831f31c3883899eb57f28360bb51192937124081':
  More adjustments to permissions.
 2012-09-17 14:45:40 -07:00
rich cannings
8e58987e35 am 2357a77b: am 42af7518: Merge "Add setting to change verifier visibility" into jb-mr1-dev 
* commit '2357a77bf50413c8eb7f576a8b757b394e440edf':
  Add setting to change verifier visibility
 2012-09-17 14:45:16 -07:00