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
Merge commit 'e7eb3a35fe35b858597410d4b41c9d027c4b83c3' into kraken
* commit 'e7eb3a35fe35b858597410d4b41c9d027c4b83c3':
Fix preloaded classes for API rename of BackupAgentHelper
Merge commit '8c6af52fdd572e19cd40a0be53615eb6c80ccde5' into froyo-plus-aosp
* commit '8c6af52fdd572e19cd40a0be53615eb6c80ccde5':
Fix preloaded classes for API rename of BackupAgentHelper
Merge commit '8d0dc62fe26e02a3a303c9286b06fc0c24c36dcb' into kraken
* commit '8d0dc62fe26e02a3a303c9286b06fc0c24c36dcb':
Replace "safeMode" with a more specific name "vmSafeMode" in the public API.
Merge commit 'ef3f5ddc2137ed99e41f00441b688fb56b855179' into froyo-plus-aosp
* commit 'ef3f5ddc2137ed99e41f00441b688fb56b855179':
Replace "safeMode" with a more specific name "vmSafeMode" in the public API.
Bug #2553187
Limit the max number of lines for each entry in the ResolveActivity to 2. Also
make sure to discard potential styling tags and newlines/space characters from
package name and activity labels.
Change-Id: Ibda3688267aa948b921164d3d3abc8c9236e61a2
Merge commit '245df5ad16ff227761906c10dc97c01901232666' into kraken
* commit '245df5ad16ff227761906c10dc97c01901232666':
API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council
Merge commit '6874362a6b3e0b75f42a2d1bf266eb2d25580b47' into kraken
* commit '6874362a6b3e0b75f42a2d1bf266eb2d25580b47':
fix [2542425] memory leak during video recording
Merge commit '3f264c4fba416f55247da3fafd6afbe55bf93598' into froyo-plus-aosp
* commit '3f264c4fba416f55247da3fafd6afbe55bf93598':
API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council
Merge commit '04fdd180cc64f2724c8b8598f1b8495fb1fa1d93' into froyo-plus-aosp
* commit '04fdd180cc64f2724c8b8598f1b8495fb1fa1d93':
fix [2542425] memory leak during video recording
Merge commit '6c75455908579c1bd48777847c0861967bc413a9' into kraken
* commit '6c75455908579c1bd48777847c0861967bc413a9':
doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes.
Merge commit '538c310b091a6cc74020423deed9d62703f3f13f' into kraken
* commit '538c310b091a6cc74020423deed9d62703f3f13f':
Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB.
Merge commit 'c46f28dc0fde1889b37bdc7066ec2af96c16e358' into froyo-plus-aosp
* commit 'c46f28dc0fde1889b37bdc7066ec2af96c16e358':
doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes.
