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

Merge "checkCarrierPrivilegesForPackage by subId rather than default" into qt-dev

Browse Source 
am: 856fe0fefc

Change-Id: Id20ca739786ef1fcaf242dbec3d5a004d19aa9a2
This commit is contained in:
Chen Xu
2019-05-13 18:30:01 -07:00
committed by android-build-merger
parent 94f23e8386 856fe0fefc
commit 5811135e2a
3 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/usage/java/com/android/server/usage/AppStandbyController.java
View File

@@ -1356,7 +1356,7 @@ public class AppStandbyController {
private void fetchCarrierPrivilegedAppsLocked() {
TelephonyManager telephonyManager =
mContext.getSystemService(TelephonyManager.class);
mCarrierPrivilegedApps = telephonyManager.getPackagesWithCarrierPrivileges();
mCarrierPrivilegedApps = telephonyManager.getPackagesWithCarrierPrivilegesForAllPhones();
mHaveCarrierPrivilegedApps = true;
if (DEBUG) {
Slog.d(TAG, "apps with carrier privilege " + mCarrierPrivilegedApps);

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

@@ -7517,7 +7517,7 @@ public class TelephonyManager {
try {
ITelephony telephony = getITelephony();
if (telephony != null)
return telephony.checkCarrierPrivilegesForPackage(pkgName);
return telephony.checkCarrierPrivilegesForPackage(getSubId(), pkgName);
} catch (RemoteException ex) {
Rlog.e(TAG, "checkCarrierPrivilegesForPackage RemoteException", ex);
} catch (NullPointerException ex) {
@@ -7568,7 +7568,7 @@ public class TelephonyManager {
try {
ITelephony telephony = getITelephony();
if (telephony != null) {
return telephony.getPackagesWithCarrierPrivileges();
return telephony.getPackagesWithCarrierPrivileges(getPhoneId());
}
} catch (RemoteException ex) {
Rlog.e(TAG, "getPackagesWithCarrierPrivileges RemoteException", ex);
@@ -7578,6 +7578,22 @@ public class TelephonyManager {
return Collections.EMPTY_LIST;
}
/** @hide */
public List<String> getPackagesWithCarrierPrivilegesForAllPhones() {
try {
ITelephony telephony = getITelephony();
if (telephony != null) {
return telephony.getPackagesWithCarrierPrivilegesForAllPhones();
}
} catch (RemoteException ex) {
Rlog.e(TAG, "getPackagesWithCarrierPrivilegesForAllPhones RemoteException", ex);
} catch (NullPointerException ex) {
Rlog.e(TAG, "getPackagesWithCarrierPrivilegesForAllPhones NPE", ex);
}
return Collections.EMPTY_LIST;
}
/** @hide */
@SystemApi
@SuppressLint("Doclava125")

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

@@ -1000,7 +1000,7 @@ interface ITelephony {
/**
* Similar to above, but check for the package whose name is pkgName.
*/
int checkCarrierPrivilegesForPackage(String pkgName);
int checkCarrierPrivilegesForPackage(int subId, String pkgName);
/**
* Similar to above, but check across all phones.
@@ -1357,9 +1357,14 @@ interface ITelephony {
in PhoneAccountHandle phoneAccountHandle, boolean enabled);
/**
* Returns a list of packages that have carrier privileges.
* Returns a list of packages that have carrier privileges for the specific phone.
*/
List<String> getPackagesWithCarrierPrivileges();
List<String> getPackagesWithCarrierPrivileges(int phoneId);
/**
* Returns a list of packages that have carrier privileges.
*/
List<String> getPackagesWithCarrierPrivilegesForAllPhones();
/**
* Return the application ID for the app type.