Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 663cc563 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "[Telephony Mainline] Removed IPackageManager reference" am: b1147076 

Change-Id: Ibd8f24213dd1aee50274456554edfaabcad58630
parents 4e34673c b1147076

telephony/java/android/telephony/ims/ProvisioningManager.java

+0 −22
Original line number Original line Diff line number Diff line
@@ -26,8 +26,6 @@ import android.annotation.SystemApi; 
import android.annotation.TestApi;

import android.annotation.TestApi;

import android.annotation.WorkerThread;

import android.annotation.WorkerThread;

import android.content.Context;

import android.content.Context;

import android.content.pm.IPackageManager;

import android.content.pm.PackageManager;

import android.os.Binder;

import android.os.Binder;

import android.os.RemoteException;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.ServiceManager;
@@ -376,10 +374,6 @@ public class ProvisioningManager { 
    @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    @RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    public void registerProvisioningChangedCallback(@NonNull @CallbackExecutor Executor executor,

    public void registerProvisioningChangedCallback(@NonNull @CallbackExecutor Executor executor,

            @NonNull Callback callback) throws ImsException {

            @NonNull Callback callback) throws ImsException {

        if (!isImsAvailableOnDevice()) {

            throw new ImsException("IMS not available on device.",

                    ImsException.CODE_ERROR_UNSUPPORTED_OPERATION);

        }

        callback.setExecutor(executor);

        callback.setExecutor(executor);

        try {

        try {

            getITelephony().registerImsProvisioningChangedCallback(mSubId, callback.getBinder());

            getITelephony().registerImsProvisioningChangedCallback(mSubId, callback.getBinder());
@@ -612,22 +606,6 @@ public class ProvisioningManager { 




    }

    }





    private static boolean isImsAvailableOnDevice() {

        IPackageManager pm = IPackageManager.Stub.asInterface(ServiceManager.getService("package"));

        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() {

    private static ITelephony getITelephony() {

        ITelephony binder = ITelephony.Stub.asInterface(

        ITelephony binder = ITelephony.Stub.asInterface(

                ServiceManager.getService(Context.TELEPHONY_SERVICE));

                ServiceManager.getService(Context.TELEPHONY_SERVICE));