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

Merge "SetDataEnabled indicate calling package" into tm-dev am: 30eec56eac

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17534333

Change-Id: I2793ec40451d725d7365f1f0cd23f90c75e4b038
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sarah Chin
2022-04-01 16:09:57 +00:00
committed by Automerger Merge Worker
parent d58a76c4ac 30eec56eac
commit df98395239
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -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.");
}

9
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

@@ -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.