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

Merge "Optimize TM#getCarrierServicePackageName[ForLogicalSlot]"

Browse Source
This commit is contained in:
Rambo Wang
2022-03-23 19:34:02 +00:00
committed by Gerrit Code Review
parent b8ebf69571 476574dfc8
commit 8ec6343dfb
2 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9417,15 +9417,7 @@ public class TelephonyManager {
@SystemApi @SystemApi
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public @Nullable String getCarrierServicePackageName() { public @Nullable String getCarrierServicePackageName() {
// TODO(b/205736323) plumb this through to CarrierPrivilegesTracker, which will cache the return getCarrierServicePackageNameForLogicalSlot(getPhoneId());
// value instead of re-querying every time.
List<String> carrierServicePackages =
getCarrierPackageNamesForIntent(
new Intent(CarrierService.CARRIER_SERVICE_INTERFACE));
if (carrierServicePackages != null && !carrierServicePackages.isEmpty()) {
return carrierServicePackages.get(0);
}
return null;
} }
/** /**
@@ -9442,13 +9434,15 @@ public class TelephonyManager {
@SystemApi @SystemApi
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public @Nullable String getCarrierServicePackageNameForLogicalSlot(int logicalSlotIndex) { public @Nullable String getCarrierServicePackageNameForLogicalSlot(int logicalSlotIndex) {
// TODO(b/205736323) plumb this through to CarrierPrivilegesTracker, which will cache the try {
// value instead of re-querying every time. ITelephony telephony = getITelephony();
List<String> carrierServicePackages = if (telephony != null) {
getCarrierPackageNamesForIntentAndPhone( return telephony.getCarrierServicePackageNameForLogicalSlot(logicalSlotIndex);
new Intent(CarrierService.CARRIER_SERVICE_INTERFACE), logicalSlotIndex); }
if (carrierServicePackages != null && !carrierServicePackages.isEmpty()) { } catch (RemoteException ex) {
return carrierServicePackages.get(0); Rlog.e(TAG, "getCarrierServicePackageNameForLogicalSlot RemoteException", ex);
} catch (NullPointerException ex) {
Rlog.e(TAG, "getCarrierServicePackageNameForLogicalSlot NPE", ex);
} }
return null; return null;
} }

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

@@ -2545,4 +2545,15 @@ interface ITelephony {
* registration technology specified, false if it is not required. * registration technology specified, false if it is not required.
*/ */
boolean isRcsProvisioningRequiredForCapability(int subId, int capability, int tech); boolean isRcsProvisioningRequiredForCapability(int subId, int capability, int tech);
/**
* Returns the package name that provides the {@link CarrierService} implementation for the
* specified {@code logicalSlotIndex}, or {@code null} if no package with carrier privileges
* declares one.
*
* @param logicalSlotIndex The slot index to fetch the {@link CarrierService} package for
* @return The system-selected package that provides the {@link CarrierService} implementation
* for the slot, or {@code null} if none is resolved
*/
String getCarrierServicePackageNameForLogicalSlot(int logicalSlotIndex);
} }