Merge "SetDataEnabled indicate calling package" into tm-dev (30eec56e) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -10556,7 +10556,7 @@ public class TelephonyManager {
		try {
		ITelephony telephony = getITelephony();
		if (telephony != null)
		return telephony.enableDataConnectivity();
		return telephony.enableDataConnectivity(getOpPackageName());
		} catch (RemoteException e) {
		Log.e(TAG, "Error calling ITelephony#enableDataConnectivity", e);
		}
		@@ -10571,7 +10571,7 @@ public class TelephonyManager {
		try {
		ITelephony telephony = getITelephony();
		if (telephony != null)
		return telephony.disableDataConnectivity();
		return telephony.disableDataConnectivity(getOpPackageName());
		} catch (RemoteException e) {
		Log.e(TAG, "Error calling ITelephony#disableDataConnectivity", e);
		}
		@@ -11931,7 +11931,7 @@ public class TelephonyManager {
		Log.d(TAG, "factoryReset: subId=" + subId);
		ITelephony telephony = getITelephony();
		if (telephony != null) {
		telephony.factoryReset(subId);
		telephony.factoryReset(subId, getOpPackageName());
		}
		} catch (RemoteException e) {
		}
		@@ -11951,7 +11951,7 @@ public class TelephonyManager {
		Log.d(TAG, "resetSettings: subId=" + getSubId());
		ITelephony telephony = getITelephony();
		if (telephony != null) {
		telephony.factoryReset(getSubId());
		telephony.factoryReset(getSubId(), getOpPackageName());
		}
		} catch (RemoteException e) {
		}
		@@ -13219,7 +13219,7 @@ public class TelephonyManager {
		try {
		ITelephony service = getITelephony();
		if (service != null) {
		service.setDataEnabledForReason(subId, reason, enabled);
		service.setDataEnabledForReason(subId, reason, enabled, getOpPackageName());
		} else {
		throw new IllegalStateException("telephony service is null.");
		}

telephony/java/com/android/internal/telephony/ITelephony.aidl

+5 −4

Original line number	Diff line number	Diff line
		@@ -270,13 +270,13 @@ interface ITelephony {
		* Allow mobile data connections.
		*/
		@UnsupportedAppUsage
		boolean enableDataConnectivity();
		boolean enableDataConnectivity(String callingPackage);

		/**
		* Disallow mobile data connections.
		*/
		@UnsupportedAppUsage
		boolean disableDataConnectivity();
		boolean disableDataConnectivity(String callingPackage);

		/**
		* Report whether data connectivity is possible.
		@@ -959,8 +959,9 @@ interface ITelephony {
		* @param subId user preferred subId.
		* @param reason the reason the data enable change is taking place
		* @param enable true to turn on, else false
		* @param callingPackage the package that changed the data enabled state
		*/
		void setDataEnabledForReason(int subId, int reason, boolean enable);
		void setDataEnabledForReason(int subId, int reason, boolean enable, String callingPackage);

		/**
		* Return whether data is enabled for certain reason
		@@ -1327,7 +1328,7 @@ interface ITelephony {
		*/
		PhoneAccountHandle getPhoneAccountHandleForSubscriptionId(int subscriptionId);

		void factoryReset(int subId);
		void factoryReset(int subId, String callingPackage);

		/**
		* Returns users's current locale based on the SIM.