From 06796273ca6411077f0dd56b61da481aa5c6e466 Mon Sep 17 00:00:00 2001
From: Meng Wang
Date: Mon, 23 Dec 2019 11:26:58 -0800
Subject: [PATCH] Remove unused broadcast DATA_CONNECTION_FAILED
Bug: 140908357
Test: make
Change-Id: Iac1730af0fbd17df60943e2b4495716d001d0d70
---
.../com/android/server/TelephonyRegistry.java | 8 --------
.../internal/telephony/TelephonyIntents.java | 18 ------------------
2 files changed, 26 deletions(-)
diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java
index 46ff71831905c..57e6096ebff27 100644
--- a/services/core/java/com/android/server/TelephonyRegistry.java
+++ b/services/core/java/com/android/server/TelephonyRegistry.java
@@ -1609,7 +1609,6 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
handleRemoveListLocked();
}
- broadcastDataConnectionFailed(apnType, subId);
}
@Override
@@ -2260,13 +2259,6 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);
}
- private void broadcastDataConnectionFailed(String apnType, int subId) {
- Intent intent = new Intent(TelephonyIntents.ACTION_DATA_CONNECTION_FAILED);
- intent.putExtra(PhoneConstants.DATA_APN_TYPE_KEY, apnType);
- intent.putExtra(PHONE_CONSTANTS_SUBSCRIPTION_KEY, subId);
- mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL);
- }
-
private void enforceNotifyPermissionOrCarrierPrivilege(String method) {
if (checkNotifyPermission()) {
return;
diff --git a/telephony/java/com/android/internal/telephony/TelephonyIntents.java b/telephony/java/com/android/internal/telephony/TelephonyIntents.java
index 024b6403bf755..08c536bf44b97 100644
--- a/telephony/java/com/android/internal/telephony/TelephonyIntents.java
+++ b/telephony/java/com/android/internal/telephony/TelephonyIntents.java
@@ -172,24 +172,6 @@ public class TelephonyIntents {
public static final String ACTION_ANY_DATA_CONNECTION_STATE_CHANGED
= "android.intent.action.ANY_DATA_STATE";
- /**
- * Broadcast Action: An attempt to establish a data connection has failed.
- * The intent will have the following extra values:
- *
- * - phoneName
- A string version of the phone name.
- * - state
- One of {@code CONNECTED}, {@code CONNECTING}, or {code DISCONNECTED}.
- * - reason
- A string indicating the reason for the failure, if available.
- *
- *
- *
- * Requires the READ_PHONE_STATE permission.
- *
- *
This is a protected intent that can only be sent
- * by the system.
- */
- public static final String ACTION_DATA_CONNECTION_FAILED
- = "android.intent.action.DATA_CONNECTION_FAILED";
-
/**
* Broadcast Action: The sim card state has changed.
* The intent will have the following extra values: