20776 Commits

Author SHA1 Message Date
Dianne Hackborn
de2722af35 Merge "Package manager optimizations." into froyo 2010-03-30 13:35:33 -07:00
Dianne Hackborn
d7c096845d Package manager optimizations.
Addresses:
Issue #2550648: PackageManagerService setComponentEnabledSetting unconditionally
writes Settings xml
Issue #2549084: Make PackageManager.addPermission have async version

Also make the writing of settings when changing the preferred activities to use
the same async mechanism, and fiddle with thread priorities in the background
thread to go up to foreground priority when holding the lock to write settings
and a few other places.  (At some point we should really clean this up to never
acquire the main lock while in the background.)

Change-Id: Ib2b7632543f6fb3f92a225518579f3b2d15e1413
2010-03-30 13:34:43 -07:00
Andreas Huber
0bca99e987 am 8899186b: Merge "Timeout on socket recv calls after 5secs, retry connection also if server unexpectedly closed the connection on its end and we know that there should\'ve been more data available." into froyo
Merge commit '8899186b60bcbfa783217a0f773e4cd032911f3c' into froyo-plus-aosp

* commit '8899186b60bcbfa783217a0f773e4cd032911f3c':
  Timeout on socket recv calls after 5secs, retry connection also if server unexpectedly closed the connection on its end and we know that there should've been more data available.
2010-03-30 13:34:39 -07:00
Daniel Lehmann
18d4b733f8 Don't load photo if it's id is 0. Saves one database query
Bug:2546767

Change-Id: I0739cd45acecd18bafda9a200dff60fdcc219021
2010-03-30 13:33:35 -07:00
Andreas Huber
8899186b60 Merge "Timeout on socket recv calls after 5secs, retry connection also if server unexpectedly closed the connection on its end and we know that there should've been more data available." into froyo 2010-03-30 13:31:57 -07:00
Irfan Sheriff
d4f3958bde Merge "Make setNumAllowedChannels asynchronous" 2010-03-30 13:30:11 -07:00
Irfan Sheriff
d8f614c9bf Make setNumAllowedChannels asynchronous
Setting the allowed channel count in the
driver can take a long time to potentially
cause ANR in the phone process. Make the call
asynchronous

Bug: 2555117
Change-Id: I66506093af0ba77c491079c29e7649732db509d1
2010-03-30 13:29:27 -07:00
Christopher Tate
e1bd78b4d1 am 4caee4f7: am b3f7fe44: am 22375e4a: Merge "Make RestoreSession.getAvailableRestoreSets() asynchronous" into froyo 2010-03-30 13:25:51 -07:00
Andreas Huber
b75d137faf Timeout on socket recv calls after 5secs, retry connection also if server unexpectedly closed the connection on its end and we know that there should've been more data available.
Change-Id: I749859dae28356080fe72ba035719754e7339c7f
related-to-bug: 2492187
2010-03-30 13:21:12 -07:00
Christopher Tate
4caee4f719 am b3f7fe44: am 22375e4a: Merge "Make RestoreSession.getAvailableRestoreSets() asynchronous" into froyo
Merge commit 'b3f7fe44f5a3a6a4c04d4102eb61f29edf83129c' into kraken

* commit 'b3f7fe44f5a3a6a4c04d4102eb61f29edf83129c':
  Make RestoreSession.getAvailableRestoreSets() asynchronous
2010-03-30 13:17:23 -07:00
Christopher Tate
b3f7fe44f5 am 22375e4a: Merge "Make RestoreSession.getAvailableRestoreSets() asynchronous" into froyo
Merge commit '22375e4a736c0d646c3cf0905c15126f7f4107c2' into froyo-plus-aosp

* commit '22375e4a736c0d646c3cf0905c15126f7f4107c2':
  Make RestoreSession.getAvailableRestoreSets() asynchronous
2010-03-30 13:13:52 -07:00
Christopher Tate
22375e4a73 Merge "Make RestoreSession.getAvailableRestoreSets() asynchronous" into froyo 2010-03-30 13:09:50 -07:00
Daniel Sandler
0c03f69c9d am 2fa4ab04: am 454a956b: am a7035909: Remove logspew. 2010-03-30 13:03:06 -07:00
Daniel Sandler
2fa4ab04b4 am 454a956b: am a7035909: Remove logspew.
Merge commit '454a956b52884083e3436fe2ea7e478df2bcbeea' into kraken

* commit '454a956b52884083e3436fe2ea7e478df2bcbeea':
  Remove logspew.
2010-03-30 12:56:36 -07:00
Daniel Sandler
454a956b52 am a7035909: Remove logspew.
Merge commit 'a7035909453c9980a5f8547f5090c70c4281156c' into froyo-plus-aosp

* commit 'a7035909453c9980a5f8547f5090c70c4281156c':
  Remove logspew.
2010-03-30 12:53:28 -07:00
Daniel Sandler
a703590945 Remove logspew.
Change-Id: I8b56a9c289dcc87080116e6af27721e24d49c3b0
2010-03-30 15:45:31 -04:00
Christopher Tate
2d449afe3d Make RestoreSession.getAvailableRestoreSets() asynchronous
This transaction can involve the transport having to query a remote backend
over the wire, so it can take a Long Time(tm).  Make it main-thread-safe by
making it asynchronous, with the results passed as a callback to the invoker's
RestoreObserver.  We also make the IRestoreObserver callback interface
properly oneway.

Bug #2550665
Bug #2549422

Change-Id: If18a233a0a3d54c7b55101715c9e6195b762c5a0
2010-03-30 12:42:35 -07:00
Patrick Scott
dee04d1701 am d43a2b5a: am 7fb1a891: am ae405d56: Merge "Fix a simple logic mistake." into froyo 2010-03-30 11:55:25 -07:00
Patrick Scott
d43a2b5a23 am 7fb1a891: am ae405d56: Merge "Fix a simple logic mistake." into froyo
Merge commit '7fb1a89128a87c30441bc839c935f8e1fb993a26' into kraken

* commit '7fb1a89128a87c30441bc839c935f8e1fb993a26':
  Fix a simple logic mistake.
2010-03-30 11:49:12 -07:00
Patrick Scott
7fb1a89128 am ae405d56: Merge "Fix a simple logic mistake." into froyo
Merge commit 'ae405d56215e4ab43e8210b66e741a0bf9d5edcf' into froyo-plus-aosp

* commit 'ae405d56215e4ab43e8210b66e741a0bf9d5edcf':
  Fix a simple logic mistake.
2010-03-30 11:45:55 -07:00
Patrick Scott
ae405d5621 Merge "Fix a simple logic mistake." into froyo 2010-03-30 11:41:29 -07:00
Jean-Michel Trivi
5a82968aec am 797e1b65: am 38cb6197: am 2a5d9f9b: Fix bug 2553592 API REVIEW: android.speech Change 1 of 4 Notes from API Council review: Rename RecognitionManager to SpeechRecognizer 2010-03-30 11:30:38 -07:00
Jean-Michel Trivi
797e1b6552 am 38cb6197: am 2a5d9f9b: Fix bug 2553592 API REVIEW: android.speech Change 1 of 4 Notes from API Council review: Rename RecognitionManager to SpeechRecognizer
Merge commit '38cb619770cf7b4207f464edc4839c79c03ad372' into kraken

* commit '38cb619770cf7b4207f464edc4839c79c03ad372':
  Fix bug 2553592 API REVIEW: android.speech
2010-03-30 11:23:23 -07:00
Jean-Michel Trivi
38cb619770 am 2a5d9f9b: Fix bug 2553592 API REVIEW: android.speech Change 1 of 4 Notes from API Council review: Rename RecognitionManager to SpeechRecognizer
Merge commit '2a5d9f9b577376768372837723f0f42098aba13b' into froyo-plus-aosp

* commit '2a5d9f9b577376768372837723f0f42098aba13b':
  Fix bug 2553592 API REVIEW: android.speech
2010-03-30 11:20:32 -07:00
Jean-Michel Trivi
2a5d9f9b57 Fix bug 2553592 API REVIEW: android.speech
Change 1 of 4
Notes from API Council review:
Rename RecognitionManager to SpeechRecognizer

Change-Id: I892c0d714d928d5e31575c72b6a36281fc4c7a8a
2010-03-30 11:14:55 -07:00
Patrick Scott
0cf6046b8d Fix a simple logic mistake.
If the icon is precomposed or the icon IS null, set the touch icon url. This
ensures there will be a touch icon set if either precomposed or regular is
specified. Precomposed icons take precedence.

Bug: 2546984
Change-Id: Id9291006ecda8659b823ab9629eb98a6f8d45f5e
2010-03-30 14:02:29 -04:00
San Mehat
9ec4f80baf am 35602efe: (-s ours) am b07d6992: (-s ours) am d4610977: Merge "framework: Hide StorageManager for froyo - DO NOT MERGE" into froyo 2010-03-30 10:52:20 -07:00
Jaikumar Ganesh
ac14c3a202 am 4160244b: am 77239140: am 0e090309: Relax the requirement of making a DBUS call for creating the Bluez Device. 2010-03-30 10:52:16 -07:00
San Mehat
35602efe48 am b07d6992: (-s ours) am d4610977: Merge "framework: Hide StorageManager for froyo - DO NOT MERGE" into froyo
Merge commit 'b07d69920199817904ccb9056e3dd56cf736e438' into kraken

* commit 'b07d69920199817904ccb9056e3dd56cf736e438':
  framework: Hide StorageManager for froyo - DO NOT MERGE
2010-03-30 10:46:23 -07:00
San Mehat
b07d699201 am d4610977: Merge "framework: Hide StorageManager for froyo - DO NOT MERGE" into froyo
Merge commit 'd4610977d9217cbd70dd59f61914c74d1ca61036' into froyo-plus-aosp

* commit 'd4610977d9217cbd70dd59f61914c74d1ca61036':
  framework: Hide StorageManager for froyo - DO NOT MERGE
2010-03-30 10:39:36 -07:00
Jaikumar Ganesh
4160244b52 am 77239140: am 0e090309: Relax the requirement of making a DBUS call for creating the Bluez Device.
Merge commit '772391402f26f418eee70039e89c0b6a8a9d69eb' into kraken

* commit '772391402f26f418eee70039e89c0b6a8a9d69eb':
  Relax the requirement of making a DBUS call for creating the Bluez Device.
2010-03-30 10:36:54 -07:00
San Mehat
d4610977d9 Merge "framework: Hide StorageManager for froyo - DO NOT MERGE" into froyo 2010-03-30 10:35:44 -07:00
Jaikumar Ganesh
772391402f am 0e090309: Relax the requirement of making a DBUS call for creating the Bluez Device.
Merge commit '0e09030977aea8b40fd177139528d4b5637c9771' into froyo-plus-aosp

* commit '0e09030977aea8b40fd177139528d4b5637c9771':
  Relax the requirement of making a DBUS call for creating the Bluez Device.
2010-03-30 10:30:48 -07:00
Jaikumar Ganesh
0e09030977 Relax the requirement of making a DBUS call for creating the Bluez Device.
Bug: 2136464

When the bluez device is created, we get the onDeviceCreated signal.
We add it to our  cache when that happens. We can have a device created
even when its not bonded - as a result of OPP. So use this cache to avoid
a DBUS call to Bluez.

Change-Id: I9465da7d72a12a6888128ff40ac1fe598cbae3c3
2010-03-30 10:23:55 -07:00
Kenny Root
aa73eec4bb am 5d8dfc17: am 664c7adb: am 7a17f0c0: Merge "Import revised translations" into froyo 2010-03-30 09:55:05 -07:00
Kenny Root
5d8dfc172b am 664c7adb: am 7a17f0c0: Merge "Import revised translations" into froyo
Merge commit '664c7adb1847dd304f36239dc63b4986bf828dc1' into kraken

* commit '664c7adb1847dd304f36239dc63b4986bf828dc1':
  Import revised translations
2010-03-30 09:38:14 -07:00
Kenny Root
664c7adb18 am 7a17f0c0: Merge "Import revised translations" into froyo
Merge commit '7a17f0c04e0d09d003e6842f9af1d7cd0efc198f' into froyo-plus-aosp

* commit '7a17f0c04e0d09d003e6842f9af1d7cd0efc198f':
  Import revised translations
2010-03-30 09:27:15 -07:00
Kenny Root
7a17f0c04e Merge "Import revised translations" into froyo 2010-03-30 09:23:16 -07:00
Jaikumar Ganesh
b677225fc1 Merge "Relax the requirement of making a DBUS call for creating the Bluez Device." 2010-03-30 09:19:56 -07:00
Kenny Root
42205f871b Import revised translations
Change-Id: I1580bddbcf945ed733725b486b2699582096d3a5
2010-03-30 09:15:10 -07:00
San Mehat
63cce836e4 framework: Hide StorageManager for froyo - DO NOT MERGE
Change-Id: Icd58d5be0de1cc0549a5d766421bcc773c8cd868
Signed-off-by: San Mehat <san@google.com>
2010-03-30 08:14:32 -07:00
Bjorn Bringert
742437f2b3 am 76b2ff33: am 3f434566: am fef8cebc: Clean up SearchableInfo API, JavaDoc and formatting 2010-03-30 04:12:59 -07:00
Bjorn Bringert
76b2ff3391 am 3f434566: am fef8cebc: Clean up SearchableInfo API, JavaDoc and formatting
Merge commit '3f434566ff3ce11f4ab21536d96cd4fa31366bf2' into kraken

* commit '3f434566ff3ce11f4ab21536d96cd4fa31366bf2':
  Clean up SearchableInfo API, JavaDoc and formatting
2010-03-30 04:06:03 -07:00
Bjorn Bringert
3f434566ff am fef8cebc: Clean up SearchableInfo API, JavaDoc and formatting
Merge commit 'fef8cebcdcf0cbd4a0dafba87e33e3b500fb1321' into froyo-plus-aosp

* commit 'fef8cebcdcf0cbd4a0dafba87e33e3b500fb1321':
  Clean up SearchableInfo API, JavaDoc and formatting
2010-03-30 03:59:36 -07:00
Bjorn Bringert
fef8cebcdc Clean up SearchableInfo API, JavaDoc and formatting
This change cleans up the JavaDoc in SearchableInfo,
removes trailing whitespace, fixes an if-statement
style violoation, and re-hides some things that were
exposed for Froyo that query deprecated or discouraged
attributes:

SearchableInfo.getSearchButtonText()
SearchableInfo.getLabelId()
SearchableInfo.getIconlId()
class SearchableInfo.ActionKeyInfo
SearchableInfo.findActionKey()

Bug http://b/issue?id=2553524

Change-Id: Iee5521c844f74137166730e523d29ba07ef1856b
2010-03-30 11:40:34 +01:00
Dianne Hackborn
3684f59138 am 93d71444: am e5132805: am e2522466: Fix issue #2547337: switching night modes 2010-03-29 21:35:25 -07:00
Dianne Hackborn
ba2ff33009 am 839e1b6c: am 2fecae38: am ad5499dd: Hopefully get rid of some ANRs. 2010-03-29 21:35:22 -07:00
Dianne Hackborn
93d7144462 am e5132805: am e2522466: Fix issue #2547337: switching night modes
Merge commit 'e5132805110ba98e301b792cc0c2141b1729b680' into kraken

* commit 'e5132805110ba98e301b792cc0c2141b1729b680':
  Fix issue #2547337: switching night modes
2010-03-29 21:23:08 -07:00
Dianne Hackborn
839e1b6c39 am 2fecae38: am ad5499dd: Hopefully get rid of some ANRs.
Merge commit '2fecae386d952197d63fb75f8ec245d87159a684' into kraken

* commit '2fecae386d952197d63fb75f8ec245d87159a684':
  Hopefully get rid of some ANRs.
2010-03-29 21:23:03 -07:00
Dianne Hackborn
e513280511 am e2522466: Fix issue #2547337: switching night modes
Merge commit 'e2522466552f9c6b7fcea866709710f53aa1f2a8' into froyo-plus-aosp

* commit 'e2522466552f9c6b7fcea866709710f53aa1f2a8':
  Fix issue #2547337: switching night modes
2010-03-29 21:19:39 -07:00