Merge "Remove Obsolete enable/disableApn functions." (19f01ebe) · Commits · e / os / android_frameworks_base

core/java/android/net/MobileDataStateTracker.java

+9 −9

Original line number	Diff line number	Diff line
		@@ -699,15 +699,15 @@ public class MobileDataStateTracker extends BaseNetworkStateTracker {
		break;
		}

		try {
		if (enable) {
		return mPhoneService.enableApnType(apnType);
		} else {
		return mPhoneService.disableApnType(apnType);
		}
		} catch (RemoteException e) {
		if (retry == 0) getPhoneService(true);
		}
		// try {
		// if (enable) {
		// return mPhoneService.enableApnType(apnType);
		// } else {
		// return mPhoneService.disableApnType(apnType);
		// }
		// } catch (RemoteException e) {
		// if (retry == 0) getPhoneService(true);
		// }
		}

		loge("Could not " + (enable ? "enable" : "disable") + " APN type \"" + apnType + "\"");

+0 −22

Original line number	Diff line number	Diff line
		@@ -3033,28 +3033,6 @@ public class TelephonyManager {
		}
		}

		/** @hide */
		@SystemApi
		public int enableApnType(String type) {
		try {
		return getITelephony().enableApnType(type);
		} catch (RemoteException e) {
		Log.e(TAG, "Error calling ITelephony#enableApnType", e);
		}
		return PhoneConstants.APN_REQUEST_FAILED;
		}

		/** @hide */
		@SystemApi
		public int disableApnType(String type) {
		try {
		return getITelephony().disableApnType(type);
		} catch (RemoteException e) {
		Log.e(TAG, "Error calling ITelephony#disableApnType", e);
		}
		return PhoneConstants.APN_REQUEST_FAILED;
		}

		/** @hide */
		@SystemApi
		public boolean enableDataConnectivity() {

+0 −21

Original line number	Diff line number	Diff line
		@@ -310,27 +310,6 @@ interface ITelephony {
		*/
		void disableLocationUpdatesUsingSubId(long subId);


		/**
		* Enable a specific APN type.
		*/
		int enableApnType(String type);

		/**
		* Disable a specific APN type.
		*/
		int disableApnType(String type);

		/**
		* Enable a specific APN type with subscription.
		*/
		int enableApnTypeUsingSub(long subId, String type);

		/**
		* Disable a specific APN type with subscription.
		*/
		int disableApnTypeUsingSub(long subId, String type);

		/**
		* Allow mobile data connections.
		*/