Merge "Remove unused broadcast DATA_CONNECTION_FAILED" (d8836ba3) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/TelephonyRegistry.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -1610,7 +1610,6 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub {

		handleRemoveListLocked();
		}
		broadcastDataConnectionFailed(apnType, subId);
		}

		public void notifyCellLocation(Bundle cellLocation) {
		@@ -2259,13 +2258,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;

+0 −18

Original line number	Diff line number	Diff line
		@@ -171,24 +171,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:</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.
		* The intent will have the following extra values:</p>