Merge commit 'a980fce64fba1df71e1e0d7ed60391bf9825a1bb'
* commit 'a980fce64fba1df71e1e0d7ed60391bf9825a1bb':
Implement USIM and add support for importing emails from USIM.
Merge commit '7c599e0288fb4ad9d393467458f59c45638d04ec' into eclair-plus-aosp
* commit '7c599e0288fb4ad9d393467458f59c45638d04ec':
Implement USIM and add support for importing emails from USIM.
Merge commit 'b7677205fa5a8d85336959dc0188467b6e98e857'
* commit 'b7677205fa5a8d85336959dc0188467b6e98e857':
Replace the bugreport symlink with a tool that starts the new dumpstate service.
Merge commit 'e131b7466c8b817896a618efe4b34eed5d3e51f9' into eclair-plus-aosp
* commit 'e131b7466c8b817896a618efe4b34eed5d3e51f9':
Replace the bugreport symlink with a tool that starts the new dumpstate service.
Merge commit '0aca78bf9c68fbdd2863403127837bacb557e91a'
* commit '0aca78bf9c68fbdd2863403127837bacb557e91a':
Override getAccounts to return an empty AccountSet in MockAccountManager. This used to throw an NPE instead since IAccountManagerService is set to NULL.
Merge commit '7a260ba96869ddae47afe773d3dae7a6a8c2b9c3' into eclair-plus-aosp
* commit '7a260ba96869ddae47afe773d3dae7a6a8c2b9c3':
Override getAccounts to return an empty AccountSet in MockAccountManager. This used to throw an NPE instead since IAccountManagerService is set to NULL.
* changes:
Override getAccounts to return an empty AccountSet in MockAccountManager. This used to throw an NPE instead since IAccountManagerService is set to NULL.
Refer to 3GPP Spec 31.102 for more details.
We read and parse USIM records instead of the RIL doing it for us.
We only support reading of USIM Phonebook records.
Merge commit '3f402cbbd25b04d4869cc78586e68c4806eb21ee'
* commit '3f402cbbd25b04d4869cc78586e68c4806eb21ee':
Add a test case to measure the power usage of loading a web page
Merge commit '19d6f7ac27448b59c936878756bad49f623a6a99' into eclair-plus-aosp
* commit '19d6f7ac27448b59c936878756bad49f623a6a99':
Add a test case to measure the power usage of loading a web page
This is accomplished by adding hasIccCard to ITelephony and do
the implemenation in PhoneInterfaceManager.java. Then change
TelephonyManager to use getITelephony().hasIccCard().
Change-Id: I26970fdf92a058502b8156a4f52c14e213217fc6
Merge commit 'acab17f02a0a94eb72a7a69456d9485ce2ff8dc3'
* commit 'acab17f02a0a94eb72a7a69456d9485ce2ff8dc3':
Promote MccTable to telephony and use it for both gsm/cdma
Merge commit '1c1ffa0cab8b56274970736d7f3b8c00c01c3d2b' into eclair-plus-aosp
* commit '1c1ffa0cab8b56274970736d7f3b8c00c01c3d2b':
Promote MccTable to telephony and use it for both gsm/cdma
Merge commit '5e5288410702ea426c401be19e9221f63532cfe8'
* commit '5e5288410702ea426c401be19e9221f63532cfe8':
When encountering a .nomedia file, notify the MediaScannerClient,
Merge commit 'e1da8be501e953cdf50b0ba2edf8fe68af8cf2b9' into eclair-plus-aosp
* commit 'e1da8be501e953cdf50b0ba2edf8fe68af8cf2b9':
When encountering a .nomedia file, notify the MediaScannerClient,
* changes:
When encountering a .nomedia file, notify the MediaScannerClient, so that it can erase the data column for entries that are in the folder containing the .nomedia file. This prevents us from deleting (via a delete trigger) files when somebody adds a .nomedia file after the fact.
Merge commit '7eb63ba5666ce470e4d99164965a28dc63e681f6'
* commit '7eb63ba5666ce470e4d99164965a28dc63e681f6':
Attach the title bar to the top of the page.
Merge commit '015897709182be40eb5e9aee19e9ef396738a33e'
* commit '015897709182be40eb5e9aee19e9ef396738a33e':
Add support for running apps with uid/gid AID_LOG by specifying android.uid.log in the manifest
Merge commit 'b00fc7357f50ba0ebc1a5e48be2a1ee096bf1b67' into eclair-plus-aosp
* commit 'b00fc7357f50ba0ebc1a5e48be2a1ee096bf1b67':
Attach the title bar to the top of the page.
Merge commit 'fbd9b87feab649dc7410711ceaa589e5f058c753' into eclair-plus-aosp
* commit 'fbd9b87feab649dc7410711ceaa589e5f058c753':
Add support for running apps with uid/gid AID_LOG by specifying android.uid.log in the manifest
Merge commit '704a488ef5f5b50ed82332cbff8d6d982ac09118' into eclair-plus-aosp
* commit '704a488ef5f5b50ed82332cbff8d6d982ac09118':
New, darker tab widgets for the platform.
so that it can erase the data column for entries that are in the
folder containing the .nomedia file. This prevents us from
deleting (via a delete trigger) files when somebody adds a
.nomedia file after the fact.
Remove the old notions of changing the viewing mode
resulting in changing the visibility of the title bar.
Instead, attach the title bar to the top of the page.
Change contentToView() to contentToViewY() (and an X
version; same change for viewToContent), to account
for the title bar's height. Adjust the parameters
for drawing the scroll bar to account for the title bar.
Requires a change to packages/apps/Browser.
Change-Id: Ic0f7d6e0a1cce58ba2bca87337cf72a8194e9aa4
Merge commit '1d56df6688e1f3cb6db9ad72694476b908e1c077'
* commit '1d56df6688e1f3cb6db9ad72694476b908e1c077':
allow subclassing for drawing vertical scrollbar, so that clients (e.g. webview) can resize/position
Merge commit '70fc625745b5c6303951113e6d17ea57870fe2f7' into eclair-plus-aosp
* commit '70fc625745b5c6303951113e6d17ea57870fe2f7':
allow subclassing for drawing vertical scrollbar, so that clients (e.g. webview) can resize/position
This is needed to allow the BugReportService to start the dumpstate service.
Change-Id: I12cab23767c919592da102c654b6b80416717661
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '461cb5613c692f734e2fe9b005d21c5a2f3e8203'
* commit '461cb5613c692f734e2fe9b005d21c5a2f3e8203':
Setting the component role appears to be mandatory now for all mime types.
