summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2012-09-14 09:05:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-14 09:05:13 -0700
commit598b3dd80f8f575c953cf8c64fb5be80d530de9a (patch)
tree4ec267111337ba18bb8486f5025b7481b63cd6e6
parent1650f080bc6e1e5cd78bca9f1c732edd2a5950b2 (diff)
parent8e36a0a6f618dd01122efc838fc90b04799b3c97 (diff)
downloadpackages_apps_Stk-598b3dd80f8f575c953cf8c64fb5be80d530de9a.zip
packages_apps_Stk-598b3dd80f8f575c953cf8c64fb5be80d530de9a.tar.gz
packages_apps_Stk-598b3dd80f8f575c953cf8c64fb5be80d530de9a.tar.bz2
am 8e36a0a6: am 3420f3cc: Merge "No response sent when backlight is OFF"
* commit '8e36a0a6f618dd01122efc838fc90b04799b3c97': No response sent when backlight is OFF
-rw-r--r--src/com/android/stk/ToneDialog.java7
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;
}
}