am 3420f3cc: Merge "No response sent when backlight is OFF"tools_r21

* commit '3420f3cc4dc3483de857d5fcc957d852e31521b0':
  No response sent when backlight is OFF

1 files changed, 5 insertions, 2 deletions

diff --git a/src/com/android/stk/ToneDialog.java b/src/com/android/stk/ToneDialog.java
index 3251aba..0370939 100644
--- a/src/com/android/stk/ToneDialog.java
+++ b/src/com/android/stk/ToneDialog.java
@@ -38,6 +38,7 @@ public class ToneDialog extends Activity {
     TextMessage toneMsg = null;
     ToneSettings settings = null;
     TonePlayer player = null;
+    boolean mIsResponseSent = false;
 
     /**
      * Handler used to stop tones from playing when the duration ends.
@@ -98,8 +99,9 @@ public class ToneDialog extends Activity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-
-        mToneStopper.removeMessages(MSG_ID_STOP_TONE);
+        if (mIsResponseSent) {
+            mToneStopper.removeMessages(MSG_ID_STOP_TONE);
+        }
         player.stop();
         player.release();
         mVibrator.cancel();
@@ -129,5 +131,6 @@ public class ToneDialog extends Activity {
         args.putInt(StkAppService.OPCODE, StkAppService.OP_RESPONSE);
         args.putInt(StkAppService.RES_ID, resId);
         startService(new Intent(this, StkAppService.class).putExtras(args));
+        mIsResponseSent = true;
     }
 }