commit 050bb052f22efcc2ec5080fdf4a778f1538ed6f4
author Peter Wang <tpwang@google.com> Mon Jan 13 23:33:09 2020 -0800
committer Brad Ebinger <breadley@google.com> Thu Jan 16 19:38:23 2020 +0000
tree 4ae3d8a6bac72f91663a7b588a82fac1fa3ce048
parent 64c865aaa57c43a839e16241910c5a59f6e05d10

[Telephony Mainline] Removed IPackageManager reference

Bug: 140908357
Test: Build
Merged-In: I275b645c5cdf37a40f27d21cdf422f8dfb3f1489
Change-Id: I275b645c5cdf37a40f27d21cdf422f8dfb3f1489

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 7303c7f..9780213 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -84,7 +84,6 @@
 import android.telephony.PhoneNumberRange;
 import android.telephony.RadioAccessFamily;
 import android.telephony.RadioAccessSpecifier;
-import com.android.telephony.Rlog;
 import android.telephony.ServiceState;
 import android.telephony.SignalStrength;
 import android.telephony.SubscriptionInfo;
@@ -174,6 +173,7 @@
 import com.android.phone.vvm.RemoteVvmTaskManager;
 import com.android.phone.vvm.VisualVoicemailSettingsUtil;
 import com.android.phone.vvm.VisualVoicemailSmsFilterConfig;
+import com.android.telephony.Rlog;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
@@ -1454,6 +1454,16 @@
         }
     }
 
+    private boolean isImsAvailableOnDevice() {
+        PackageManager pm = getDefaultPhone().getContext().getPackageManager();
+        if (pm == null) {
+            // For some reason package manger is not available.. This will fail internally anyway,
+            // so do not throw error and allow.
+            return true;
+        }
+        return pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_IMS, 0);
+    }
+
     public void dial(String number) {
         dialForSubscriber(getPreferredVoiceSubscription(), number);
     }
@@ -3420,6 +3430,11 @@
         enforceReadPrivilegedPermission("registerImsProvisioningChangedCallback");
         final long identity = Binder.clearCallingIdentity();
         try {
+            if (isImsAvailableOnDevice()) {
+                throw new ImsException("IMS not available on device.",
+                        ImsException.CODE_ERROR_UNSUPPORTED_OPERATION);
+            }
+
             // TODO: Refactor to remove ImsManager dependence and query through ImsPhone directly.
             ImsManager.getInstance(mApp, getSlotIndexOrException(subId))
                     .addProvisioningCallbackForSubscription(callback, subId);