Merge commit 'b249890bc6740531898d94aaecac34d5736106bc'
* commit 'b249890bc6740531898d94aaecac34d5736106bc':
Add framework support for scrolling to the "More results..." list item
Merge commit '892771ab81f79a6b0cf9735701760c5a12d6ab85'
* commit '892771ab81f79a6b0cf9735701760c5a12d6ab85':
Rename WRITE_SDCARD to WRITE_EXTERNAL_STORAGE in browser test app
Merge commit 'ff0d91479d3c8523bc290bd1b65fcd2546be1d40'
* commit 'ff0d91479d3c8523bc290bd1b65fcd2546be1d40':
Manually merge a few fixes from cupcake and cupcake_dcm.
CL 144717: Correctly set user data payload length for non-7-bit encoded payload.
CL 149058: Check for null TP-OA in SmsMessage.parseMessageBody().
CL 138094: Make sure call state (and other updates) have a chance to get processed between data setup attempts.
CL 132624: Added a comment for a way to save a message to the SIM.
Merge commit '50566b3554f440d6b84a696875147d8d21682b10'
* commit '50566b3554f440d6b84a696875147d8d21682b10':
Update reliability test code. Use a separate activity with simpler calback mechanism.
Merge commit 'fa30c0eed3386af37be0f0df7aeaa886a8e6095d'
* commit 'fa30c0eed3386af37be0f0df7aeaa886a8e6095d':
Fix a bug in AppSecurityPermissions where it wouldn't display permissions used by an app if it uses a shared user id.
* changes:
Fix a bug in AppSecurityPermissions where it wouldn't display permissions used by an app if it uses a shared user id. Remove the else clause and always get the list of requested permissions first before adding the permissions obtained via the shared user id. Also change an if condition and comments for better readability
Merge commit '10d273bb69016f7eb056d7ea1f3a929a5f5a3314'
* commit '10d273bb69016f7eb056d7ea1f3a929a5f5a3314':
Check if the ownerView is still attached to window in
Merge commit '181fafaf48208978b8ba2022683ffa78aaeddde1'
* commit '181fafaf48208978b8ba2022683ffa78aaeddde1':
Retool the backup process to use a new 'BackupAgent' class
Merge commit 'c01159bb00f7273f9b051dfbbe6bc10d54d3a846'
* commit 'c01159bb00f7273f9b051dfbbe6bc10d54d3a846':
AI 149404: Am sending again with the latest changes
Backups will be handled by launching the application in a special
mode under which no activities or services will be started, only
the BackupAgent subclass named in the app's android:backupAgent
manifest property. This takes the place of the BackupService class
used earlier during development.
In the cases of *full* backup or restore, an application that does
not supply its own BackupAgent will be launched in a restricted
manner; in particular, it will be using the default Application
class rather than any manifest-declared one. This ensures that the
app is not running any code that may try to manipulate its data
while the backup system reads/writes its data set.
Merge commit '7363e049ec7c2f490acf783a979ea101df35a055' into donut
* commit '7363e049ec7c2f490acf783a979ea101df35a055':
AI 149404: Am sending again with the latest changes
Bug 1883998: We only support sending 8-bit references for now.
Bug 1885080: Also fix the GsmAlphabetTest, which started failing when SmsHeader
was re-worked.
Merge commit 'afbc9ab3707cc8b1954333f258f220800b3cc104'
* commit 'afbc9ab3707cc8b1954333f258f220800b3cc104':
* Chagned RecognitionService interface to use more complex RecognitionResult instead of String.
Merge commit 'c3b7e4e7dda7a81e7f1017f17adb717ffb3d50d2'
* commit 'c3b7e4e7dda7a81e7f1017f17adb717ffb3d50d2':
Telephony support for SMS memory reporting to the network.
