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

Merge "Optimize TM#getCarrierServicePackageName[ForLogicalSlot]" am: 8ec6343dfb

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

Change-Id: I5b54dc6e55469004fa53dc375e4dbf15ddb7c70c
This commit is contained in:
Rambo Wang
2022-03-23 19:54:12 +00:00
committed by Automerger Merge Worker
parent 2e64dda571 8ec6343dfb
commit d81fc9d312
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
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public @Nullable String getCarrierServicePackageName() {
// TODO(b/205736323) plumb this through to CarrierPrivilegesTracker, which will cache the
// 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;
return getCarrierServicePackageNameForLogicalSlot(getPhoneId());
}
/**
@@ -9442,13 +9434,15 @@ public class TelephonyManager {
@SystemApi
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public @Nullable String getCarrierServicePackageNameForLogicalSlot(int logicalSlotIndex) {
// TODO(b/205736323) plumb this through to CarrierPrivilegesTracker, which will cache the
// value instead of re-querying every time.
List<String> carrierServicePackages =
getCarrierPackageNamesForIntentAndPhone(
new Intent(CarrierService.CARRIER_SERVICE_INTERFACE), logicalSlotIndex);
if (carrierServicePackages != null && !carrierServicePackages.isEmpty()) {
return carrierServicePackages.get(0);
try {
ITelephony telephony = getITelephony();
if (telephony != null) {
return telephony.getCarrierServicePackageNameForLogicalSlot(logicalSlotIndex);
}
} catch (RemoteException ex) {
Rlog.e(TAG, "getCarrierServicePackageNameForLogicalSlot RemoteException", ex);
} catch (NullPointerException ex) {
Rlog.e(TAG, "getCarrierServicePackageNameForLogicalSlot NPE", ex);
}
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.
*/
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);
}