Revert "Make voicemail notification dismissable"
Voicemail notification is required to be a non-dismissable alert for some carriers.
This reverts commit 44be27432a984f9072150c9525477e54cbfe96fd
Bug: 7888110
Change-Id: Iaf6523cff53850422ab06c2c80cc30c6b2987499
diff --git a/src/com/android/phone/ClearMWIService.java b/src/com/android/phone/ClearMWIService.java
deleted file mode 100644
index f718b69..0000000
--- a/src/com/android/phone/ClearMWIService.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.phone;
-
-import android.app.IntentService;
-import android.content.Intent;
-
-/**
- * Handles the intent to clear the voicemails that is triggered when a notification is dismissed.
- */
-public class ClearMWIService extends IntentService {
- /** This action is used to clear voicemails. */
- public static final String ACTION_CLEAR_VOICEMAILS =
- "com.android.phone.intent.CLEAR_VOICEMAILS";
-
- private PhoneGlobals mApp;
-
- public ClearMWIService() {
- super(ClearMWIService.class.getSimpleName());
- }
-
- @Override
- public void onCreate() {
- super.onCreate();
- mApp = PhoneGlobals.getInstance();
- }
-
- @Override
- protected void onHandleIntent(Intent intent) {
- if (ACTION_CLEAR_VOICEMAILS.equals(intent.getAction())) {
- mApp.notificationMgr.cancelMWINotification();
- }
- }
-}
diff --git a/src/com/android/phone/NotificationMgr.java b/src/com/android/phone/NotificationMgr.java
index 7a3ae0e..42dcdb6 100644
--- a/src/com/android/phone/NotificationMgr.java
+++ b/src/com/android/phone/NotificationMgr.java
@@ -1274,9 +1274,7 @@
.setContentTitle(notificationTitle)
.setContentText(notificationText)
.setContentIntent(pendingIntent)
- .setSound(ringtoneUri)
- .setAutoCancel(true)
- .setDeleteIntent(createClearMWIIntent());
+ .setSound(ringtoneUri);
Notification notification = builder.getNotification();
CallFeaturesSetting.migrateVoicemailVibrationSettingsIfNeeded(prefs);
@@ -1285,6 +1283,7 @@
if (vibrate) {
notification.defaults |= Notification.DEFAULT_VIBRATE;
}
+ notification.flags |= Notification.FLAG_NO_CLEAR;
configureLedNotification(notification);
mNotificationManager.notify(VOICEMAIL_NOTIFICATION, notification);
} else {
@@ -1292,16 +1291,6 @@
}
}
- private PendingIntent createClearMWIIntent() {
- Intent intent = new Intent(mContext, ClearMWIService.class);
- intent.setAction(ClearMWIService.ACTION_CLEAR_VOICEMAILS);
- return PendingIntent.getService(mContext, 0, intent, 0);
- }
-
- void cancelMWINotification() {
- updateMwi(false);
- }
-
/**
* Updates the message call forwarding indicator notification.
*
