Fix ECM issues
Fix crash in EmergencyCallbackModeExitDialog
* Return immediately if not in ECM and don't register receivers/show dialog
* Add more logging to diagnose future issues
Make sure ECM notification doesn't show up if emergency call is dialed twice
and then ECM mode dismissed.
* Fixed a timer leak that was causing the ECM notification to be posted
constantly even if we were out of ECM. This happens if ECMService has
startTimerNotification called and mTimer is not previously null.
* As a safeguard, if showNotification is called and we are already out of ECM,
stop the service.
Bug: 17958545
Change-Id: Ife3117eba2a750bc6a8e9cb59f3b5f55d563409a
diff --git a/src/com/android/phone/EmergencyCallbackModeService.java b/src/com/android/phone/EmergencyCallbackModeService.java
index e1f7fb3..3310df1 100644
--- a/src/com/android/phone/EmergencyCallbackModeService.java
+++ b/src/com/android/phone/EmergencyCallbackModeService.java
@@ -144,26 +144,40 @@
showNotification(ecmTimeout);
// Start countdown timer for the notification updates
- mTimer = new CountDownTimer(ecmTimeout, 1000) {
+ if (mTimer != null) {
+ mTimer.cancel();
+ } else {
+ mTimer = new CountDownTimer(ecmTimeout, 1000) {
- @Override
- public void onTick(long millisUntilFinished) {
- mTimeLeft = millisUntilFinished;
- EmergencyCallbackModeService.this.showNotification(millisUntilFinished);
- }
+ @Override
+ public void onTick(long millisUntilFinished) {
+ mTimeLeft = millisUntilFinished;
+ EmergencyCallbackModeService.this.showNotification(millisUntilFinished);
+ }
- @Override
- public void onFinish() {
- //Do nothing
- }
+ @Override
+ public void onFinish() {
+ //Do nothing
+ }
- }.start();
+ };
+ }
+ mTimer.start();
}
/**
* Shows notification for Emergency Callback Mode
*/
private void showNotification(long millisUntilFinished) {
+ final boolean isInEcm = Boolean.parseBoolean(
+ SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE));
+ if (!isInEcm) {
+ Log.i(LOG_TAG, "Asked to show notification but not in ECM mode");
+ if (mTimer != null) {
+ mTimer.cancel();
+ }
+ return;
+ }
final Notification.Builder builder = new Notification.Builder(getApplicationContext());
builder.setOngoing(true);
builder.setPriority(Notification.PRIORITY_HIGH);