diff options
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 14 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/ITelephony.aidl | 9 |
2 files changed, 13 insertions, 10 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index e5d56849933e..87c337da8ccb 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -3134,8 +3134,10 @@ public class TelephonyManager { return "LTE_CA"; case NETWORK_TYPE_NR: return "NR"; - default: + case NETWORK_TYPE_UNKNOWN: return "UNKNOWN"; + default: + return "UNKNOWN(" + type + ")"; } } @@ -10291,7 +10293,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); } @@ -10305,7 +10307,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); } @@ -11682,7 +11684,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) { } @@ -11702,7 +11704,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) { } @@ -12942,7 +12944,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."); } diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index 2c1167f0b8b9..f5877d8fd20a 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -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 @@ -1332,7 +1333,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. |