Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove unused broadcast DATA_CONNECTION_FAILED" am: d8836ba33f am: 2d9062cc48

Browse Source 
Change-Id: Ic6046fc883372c42fd95886b143c1661b027cf6e
This commit is contained in:
Automerger Merge Worker
2020-01-07 20:31:13 +00:00
parent e1d4aa1ab4 2d9062cc48
commit 626ceae57e
2 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/TelephonyRegistry.java
View File

@@ -1610,7 +1610,6 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
handleRemoveListLocked(); handleRemoveListLocked();
} }
broadcastDataConnectionFailed(apnType, subId);
} }
public void notifyCellLocation(Bundle cellLocation) { public void notifyCellLocation(Bundle cellLocation) {
@@ -2259,13 +2258,6 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {
mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL); 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) { private void enforceNotifyPermissionOrCarrierPrivilege(String method) {
if (checkNotifyPermission()) { if (checkNotifyPermission()) {
return; return;

18
telephony/java/com/android/internal/telephony/TelephonyIntents.java
View File

@@ -171,24 +171,6 @@ public class TelephonyIntents {
public static final String ACTION_ANY_DATA_CONNECTION_STATE_CHANGED public static final String ACTION_ANY_DATA_CONNECTION_STATE_CHANGED
= "android.intent.action.ANY_DATA_STATE"; = "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:</p>
* <dl>
* <dt>phoneName</dt><dd>A string version of the phone name.</dd>
* <dt>state</dt><dd>One of {@code CONNECTED}, {@code CONNECTING}, or {code DISCONNECTED}.</dd>
* <dt>reason</dt><dd>A string indicating the reason for the failure, if available.</dd>
* </dl>
*
* <p class="note">
* Requires the READ_PHONE_STATE permission.
*
* <p class="note">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. * Broadcast Action: The sim card state has changed.
* The intent will have the following extra values:</p> * The intent will have the following extra values:</p>