diff options
author | Juffin Alex Varghese <jalex@codeaurora.org> | 2014-08-07 17:07:07 +0530 |
---|---|---|
committer | Linux Build Service Account <lnxbuild@localhost> | 2014-11-04 08:25:48 -0700 |
commit | c5ac16f0f710645b1485503d5751790afaa768f5 (patch) | |
tree | 1aa3f06f87a3d2c0f19683b9967b9f5c328c0f20 | |
parent | ec548c06dd59b02030a21e2146d3637584d4a804 (diff) | |
download | android_packages_apps_Bluetooth-c5ac16f0f710645b1485503d5751790afaa768f5.tar.gz android_packages_apps_Bluetooth-c5ac16f0f710645b1485503d5751790afaa768f5.tar.bz2 android_packages_apps_Bluetooth-c5ac16f0f710645b1485503d5751790afaa768f5.zip |
Bluetooth-OPP: Add android configchanges attribute in manifest
Android configchanges attribute is added to application manifest
so that activity will not close during orientation changes.
OPP cleanup api will be called in onDestroy instead of onPause.
Otherwise, if device went to suspend/display OFF during BTON activity
onPause is called and share file information is removed from hashmap
This will lead to transfer failure.
CRs-Fixed: 706665
Change-Id: I8c5f7a6e164e1efb1c14e964cce7910ead66e278
-rwxr-xr-x | AndroidManifest.xml | 1 | ||||
-rw-r--r-- | src/com/android/bluetooth/opp/BluetoothOppBtEnableActivity.java | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e5bf9a741..d22130aa9 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -162,6 +162,7 @@ </activity> <activity android:name=".opp.BluetoothOppBtEnableActivity" android:process="@string/process" + android:configChanges="orientation|keyboardHidden|screenSize" android:excludeFromRecents="true" android:theme="@*android:style/Theme.Holo.Dialog.Alert" android:enabled="@bool/profile_supported_opp"> diff --git a/src/com/android/bluetooth/opp/BluetoothOppBtEnableActivity.java b/src/com/android/bluetooth/opp/BluetoothOppBtEnableActivity.java index 308bf27d9..c407ce066 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppBtEnableActivity.java +++ b/src/com/android/bluetooth/opp/BluetoothOppBtEnableActivity.java @@ -105,8 +105,8 @@ public class BluetoothOppBtEnableActivity extends AlertActivity implements } @Override - public void onPause() { - super.onPause(); + public void onDestroy() { + super.onDestroy(); if (!mBtEnabled) { mOppManager.cleanUpSendingFileInfo(); |