summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-03-14 17:45:29 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-14 17:45:29 -0700
commit38bc9f0701150e089dd624bb30ac286637b5c2b9 (patch)
tree46ffefd8cfe2e5657579e946b751f0e08fd38de5 /packages
parent5da789a6735a9e06e6cd6b72b09c7de9bf7715a8 (diff)
parentf4c9c140a204c83c6185b9ada0e33e740ecf779b (diff)
downloadframeworks_base-38bc9f0701150e089dd624bb30ac286637b5c2b9.zip
frameworks_base-38bc9f0701150e089dd624bb30ac286637b5c2b9.tar.gz
frameworks_base-38bc9f0701150e089dd624bb30ac286637b5c2b9.tar.bz2
am f4c9c140: Merge "Fix broadcast receiver leak in UsbConfirmActivity" into honeycomb-mr1
* commit 'f4c9c140a204c83c6185b9ada0e33e740ecf779b': Fix broadcast receiver leak in UsbConfirmActivity
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/usb/UsbConfirmActivity.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/usb/UsbConfirmActivity.java b/packages/SystemUI/src/com/android/systemui/usb/UsbConfirmActivity.java
index 4e6f81f..2781246 100644
--- a/packages/SystemUI/src/com/android/systemui/usb/UsbConfirmActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/usb/UsbConfirmActivity.java
@@ -100,6 +100,14 @@ public class UsbConfirmActivity extends AlertActivity
}
+ @Override
+ protected void onDestroy() {
+ if (mDisconnectedReceiver != null) {
+ unregisterReceiver(mDisconnectedReceiver);
+ }
+ super.onDestroy();
+ }
+
public void onClick(DialogInterface dialog, int which) {
if (which == AlertDialog.BUTTON_POSITIVE) {
try {