diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-03-14 17:51:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-14 17:51:44 -0700 |
| commit | 862481c29926af042856aa78d06af24f40a84804 (patch) | |
| tree | 7da7b5ffb460d95133a78db0534c4aebee339970 /packages | |
| parent | 0affbcf8b0c7d4e77a177eacd890b015e3ada12f (diff) | |
| parent | 1c4e4fcc473f47bda351cec3e48652f5392e6498 (diff) | |
| download | frameworks_base-862481c29926af042856aa78d06af24f40a84804.zip frameworks_base-862481c29926af042856aa78d06af24f40a84804.tar.gz frameworks_base-862481c29926af042856aa78d06af24f40a84804.tar.bz2 | |
am 1c4e4fcc: am 38bc9f07: am f4c9c140: Merge "Fix broadcast receiver leak in UsbConfirmActivity" into honeycomb-mr1
* commit '1c4e4fcc473f47bda351cec3e48652f5392e6498':
Fix broadcast receiver leak in UsbConfirmActivity
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/usb/UsbConfirmActivity.java | 8 |
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 { |