[Telephony Mainline] Removed IPackageManager reference

Bug: 140908357
Test: Build
Change-Id: I53d7d98b9689c1b4f764c24fc17bb488adcf96b5
This commit is contained in:
Peter Wang
2020-01-13 23:31:06 -08:00
parent 3bbd8f5da6
commit e8a2a8439e

View File

@@ -25,8 +25,6 @@ import android.annotation.StringDef;
import android.annotation.SystemApi;
import android.annotation.TestApi;
import android.annotation.WorkerThread;
import android.content.pm.IPackageManager;
import android.content.pm.PackageManager;
import android.os.Binder;
import android.os.RemoteException;
import android.telephony.CarrierConfigManager;
@@ -382,10 +380,6 @@ public class ProvisioningManager {
@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public void registerProvisioningChangedCallback(@NonNull @CallbackExecutor Executor executor,
@NonNull Callback callback) throws ImsException {
if (!isImsAvailableOnDevice()) {
throw new ImsException("IMS not available on device.",
ImsException.CODE_ERROR_UNSUPPORTED_OPERATION);
}
callback.setExecutor(executor);
try {
getITelephony().registerImsProvisioningChangedCallback(mSubId, callback.getBinder());
@@ -612,26 +606,6 @@ public class ProvisioningManager {
+ "supported");
}
private static boolean isImsAvailableOnDevice() {
IPackageManager pm = IPackageManager.Stub.asInterface(
TelephonyFrameworkInitializer
.getTelephonyServiceManager()
.getPackageManagerServiceRegisterer()
.get());
if (pm == null) {
// For some reason package manger is not available.. This will fail internally anyways,
// so do not throw error and allow.
return true;
}
try {
return pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_IMS, 0);
} catch (RemoteException e) {
// For some reason package manger is not available.. This will fail internally anyways,
// so do not throw error and allow.
}
return true;
}
private static ITelephony getITelephony() {
ITelephony binder = ITelephony.Stub.asInterface(
TelephonyFrameworkInitializer