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.
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
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
Merge commit 'b07d69920199817904ccb9056e3dd56cf736e438' into kraken
* commit 'b07d69920199817904ccb9056e3dd56cf736e438':
framework: Hide StorageManager for froyo - DO NOT MERGE
Merge commit 'd4610977d9217cbd70dd59f61914c74d1ca61036' into froyo-plus-aosp
* commit 'd4610977d9217cbd70dd59f61914c74d1ca61036':
framework: Hide StorageManager for froyo - DO NOT MERGE
Merge commit '772391402f26f418eee70039e89c0b6a8a9d69eb' into kraken
* commit '772391402f26f418eee70039e89c0b6a8a9d69eb':
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.
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
Merge commit '3f434566ff3ce11f4ab21536d96cd4fa31366bf2' into kraken
* commit '3f434566ff3ce11f4ab21536d96cd4fa31366bf2':
Clean up SearchableInfo API, JavaDoc and formatting
Merge commit 'fef8cebcdcf0cbd4a0dafba87e33e3b500fb1321' into froyo-plus-aosp
* commit 'fef8cebcdcf0cbd4a0dafba87e33e3b500fb1321':
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
Merge commit '2fecae386d952197d63fb75f8ec245d87159a684' into kraken
* commit '2fecae386d952197d63fb75f8ec245d87159a684':
Hopefully get rid of some ANRs.
Merge commit 'ad5499dd204a1512471778462a805a288595f2f2' into froyo-plus-aosp
* commit 'ad5499dd204a1512471778462a805a288595f2f2':
Hopefully get rid of some ANRs.
Don't hold the activity manager lock the entire time we are processing an ANR,
which often causes us to cause a second ANR as someone else calls into the
activity manager and gets blocked.
Change-Id: Ife4db82b12d6f4378ac2705bd6f60beb1244a1e6
Merge commit '629d03f12251220daf26abc5be86d4649318a331' into kraken
* commit '629d03f12251220daf26abc5be86d4649318a331':
Fix for bug 2548048 - it was impossible for applications to discover
Merge commit 'a599dafe4ffc3e6cc4953a7e3d33f4da80aabf45' into froyo-plus-aosp
* commit 'a599dafe4ffc3e6cc4953a7e3d33f4da80aabf45':
Fix for bug 2548048 - it was impossible for applications to discover
