Merge "use @SystemAPI in PackageManager"
diff --git a/res/layout/emergency_dialer.xml b/res/layout/emergency_dialer.xml
index 6247379..892b8f4 100644
--- a/res/layout/emergency_dialer.xml
+++ b/res/layout/emergency_dialer.xml
@@ -108,7 +108,7 @@
<View
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:backgroundTint="#ffe53935"
+ android:backgroundTint="#ffe32926"
android:focusable="false"
android:clickable="false"
style="?android:attr/buttonStyle"/>
diff --git a/src/com/android/phone/CallBarringDeselectAllPreference.java b/src/com/android/phone/CallBarringDeselectAllPreference.java
index 153bc0c..e9310f8 100644
--- a/src/com/android/phone/CallBarringDeselectAllPreference.java
+++ b/src/com/android/phone/CallBarringDeselectAllPreference.java
@@ -18,7 +18,6 @@
import android.content.Context;
import android.os.Bundle;
-import android.telephony.ServiceState;
import android.util.AttributeSet;
import android.util.Log;
import android.view.View;
@@ -52,9 +51,7 @@
protected void showDialog(Bundle state) {
// Finds out if the password field should be shown or not.
ImsPhone imsPhone = mPhone != null ? (ImsPhone) mPhone.getImsPhone() : null;
- mShowPassword = !(imsPhone != null
- && ((imsPhone.getServiceState().getState() == ServiceState.STATE_IN_SERVICE)
- || imsPhone.isUtEnabled()));
+ mShowPassword = !(imsPhone != null && imsPhone.isUtEnabled());
// Selects dialog message depending on if the password field is shown or not.
setDialogMessage(getContext().getString(mShowPassword
diff --git a/src/com/android/phone/CallBarringEditPreference.java b/src/com/android/phone/CallBarringEditPreference.java
index 72b3ea5..edff1e3 100644
--- a/src/com/android/phone/CallBarringEditPreference.java
+++ b/src/com/android/phone/CallBarringEditPreference.java
@@ -26,7 +26,6 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
-import android.telephony.ServiceState;
import android.text.method.DigitsKeyListener;
import android.text.method.PasswordTransformationMethod;
import android.util.AttributeSet;
@@ -257,9 +256,7 @@
private void setShowPassword() {
ImsPhone imsPhone = mPhone != null ? (ImsPhone) mPhone.getImsPhone() : null;
- mShowPassword = !(imsPhone != null
- && ((imsPhone.getServiceState().getState() == ServiceState.STATE_IN_SERVICE)
- || imsPhone.isUtEnabled()));
+ mShowPassword = !(imsPhone != null && imsPhone.isUtEnabled());
}
@Override
diff --git a/src/com/android/phone/GsmUmtsCallBarringOptions.java b/src/com/android/phone/GsmUmtsCallBarringOptions.java
index a6f9844..3c9cd84 100644
--- a/src/com/android/phone/GsmUmtsCallBarringOptions.java
+++ b/src/com/android/phone/GsmUmtsCallBarringOptions.java
@@ -27,7 +27,6 @@
import android.preference.Preference;
import android.preference.PreferenceScreen;
import android.telephony.CarrierConfigManager;
-import android.telephony.ServiceState;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.util.Log;
@@ -423,9 +422,7 @@
boolean useDisableaAll = true;
ImsPhone imsPhone = mPhone != null ? (ImsPhone) mPhone.getImsPhone() : null;
- if (imsPhone != null
- && ((imsPhone.getServiceState().getState() == ServiceState.STATE_IN_SERVICE)
- || imsPhone.isUtEnabled())) {
+ if (imsPhone != null && imsPhone.isUtEnabled()) {
usePassword = false;
useDisableaAll = false;
}
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 5364417..ba77faf 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -158,6 +158,7 @@
import com.android.internal.telephony.uicc.UiccController;
import com.android.internal.telephony.uicc.UiccProfile;
import com.android.internal.telephony.uicc.UiccSlot;
+import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppType;
import com.android.internal.telephony.util.VoicemailNotificationSettingsUtil;
import com.android.internal.util.HexDump;
import com.android.phone.settings.PickSmsSubscriptionActivity;
@@ -7004,6 +7005,33 @@
}
}
+ @Override
+ public boolean isApplicationOnUicc(int subId, int appType) {
+ enforceReadPrivilegedPermission("isApplicationOnUicc");
+ Phone phone = getPhone(subId);
+ if (phone == null) {
+ return false;
+ }
+ final long identity = Binder.clearCallingIdentity();
+ try {
+ UiccCard uiccCard = phone.getUiccCard();
+ if (uiccCard == null) {
+ return false;
+ }
+ UiccProfile uiccProfile = uiccCard.getUiccProfile();
+ if (uiccProfile == null) {
+ return false;
+ }
+ if (TelephonyManager.APPTYPE_SIM <= appType
+ && appType <= TelephonyManager.APPTYPE_ISIM) {
+ return uiccProfile.isApplicationOnIcc(AppType.values()[appType]);
+ }
+ return false;
+ } finally {
+ Binder.restoreCallingIdentity(identity);
+ }
+ }
+
/**
* Get whether making changes to modem configurations will trigger reboot.
* Return value defaults to true.