Merge commit '436344ae12c819f58306ceb94241a266141e1218' into eclair-plus-aosp
* commit '436344ae12c819f58306ceb94241a266141e1218':
Turn off most of the backup-related debug logging
Merge commit '10be7542327e1d4483b33730164e5404ed48d73e' into eclair-plus-aosp
* commit '10be7542327e1d4483b33730164e5404ed48d73e':
If the textfield is offscreen at the end of a zoom, remove it.
The core logging in BackupManagerService and in the Google backup transport are
still enabled at this point.
Change-Id: I10abfa565bbd1097dd3631051b6aca163e4af33a
Merge commit '094e3e0bcc81a795f35ac2ea218d0fc0109100cf' into eclair-plus-aosp
* commit '094e3e0bcc81a795f35ac2ea218d0fc0109100cf':
Check if rename of backed up file fails before persisting new changes.
* changes:
Check if rename of backed up file fails before persisting new changes. If not these system services will end up with inconsistent settings files when the device runs out of storage. Delete mangled settings file in PackageManager if the current write fails so that we don't end up overwriting the backed up version with the mangled version Include null check when retrieving fwd locked resource for an existing package
If not these system services will end up with inconsistent settings files
when the device runs out of storage.
Delete mangled settings file in PackageManager if the current write fails
so that we don't end up overwriting the backed up version with the
mangled version
Include null check when retrieving fwd locked resource for an existing package
When turning off BT while connected to an A2DP/HFP headset we can hit the path
BluetoothHeadsetService.onReceive(BluetoothHeadset.STATE_CHANGED) ->
BluetoothHandsfree.audioOff() ->
BluetoothA2dp.resumeSink() ->
which causes resumeSink() to NPE because mAudioDevices.get() returns null.
It's a race between A2DP marking the device as disconnected, and HFP marking
the device as disconnected.
Fix is to NPE check in resumeSink().
Change-Id: I2782ac8c70ea1678d7de5fcd49bff8e03df36f4e
Merge commit 'b392c53f1f0bf3c757496295d5ad7a7d00ef151a' into eclair-plus-aosp
* commit 'b392c53f1f0bf3c757496295d5ad7a7d00ef151a':
Set BondState to Bonding only if it not Bonded already.
Merge commit 'a33e3f79259b56b03c7912af35944f34ad190e3c' into eclair-plus-aosp
* commit 'a33e3f79259b56b03c7912af35944f34ad190e3c':
Fix issue #2154794: Force close when start facebook application.
I think when we were scanning the updated app in the system image,
from an older version on the data partition, we were not setting
the existing package to have the system flag, so not auto-granting
any new permissions.
This also includes some other cleanup in the package manager to
remove old files in various places, and tighten up logging.
Also similar logging cleanup elsewhere.
Change-Id: I6d113c7cf7e736ab9be512d6d7c94c806a24199a
Merge commit '935cbda0df2d55247c30d65534ecf31b1ee164b5' into eclair-plus-aosp
* commit '935cbda0df2d55247c30d65534ecf31b1ee164b5':
Debugging for #2027266: app drawer showing up on the side
Merge commit 'd2c494d9be366aed081742c097b97816a6ed9d44' into eclair-plus-aosp
* commit 'd2c494d9be366aed081742c097b97816a6ed9d44':
add class description and revise descriptions for
Merge commit '17d262f2322258ab88ba2b012c10df37d207ba99' into eclair-plus-aosp
* commit '17d262f2322258ab88ba2b012c10df37d207ba99':
Fix for 2155255: Revert "Cache inflated view to avoid inflation of layouts in preferences"
This introduces problems when scrolling through preference screens, due
to a clash in this cache versus the ListView's cache.
This reverts commit 01dbc2ed55.
Sometimes we might be paired but the other end might not have stored the link
key. So when we initiate connection the other end will ask for the authorization.
This was setting out Bond State to Bonding.
Change-Id: Iba6fd660ac90a3f48da62e7b6cf479054624a5af
Merge commit '486733c1fd564acd6d1b72e38147eb5e6d3a3d71' into eclair-plus-aosp
* commit '486733c1fd564acd6d1b72e38147eb5e6d3a3d71':
Update <video> implementation after new IRC discussion with Eric Carlsson.
Merge commit '27d8514f56574011c606daedc5cabf0219b5be81' into eclair-plus-aosp
* commit '27d8514f56574011c606daedc5cabf0219b5be81':
Fix possible crash in AutoCompleteTextView.
- move poster drawing on the WebKit side
- get rid of the child views
- add prepareToPlay method to the MediaPlayer iface.
Fixes http://b/issue?id=2156592
This change makes sure that ACTV will not take action when an event is
received in a popup that just got dismissed.
This change also makes public two XML attributes of ACTV whose corresponding
Java APIs are public.
This change also fixes a couple of typos.
Change-Id: I78f113bc522d199ff3db44fc4cc3a1882afe822e
Merge commit '1537a25520405f384b072c58fee935a29c4e14ea' into eclair-plus-aosp
* commit '1537a25520405f384b072c58fee935a29c4e14ea':
Remove unused api in QuickContact.java and fix the build.
