commit 15e2c54a2f4b75812b04bb32c6feb58158f0f318
author Zoltan Szatmary-Ban <szatmz@google.com> Wed Jan 07 12:31:55 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 07 12:31:57 2015 +0000
tree ce633e91dc087340b3e5f0a8b6347667d4e1451e
parent be3b0c4ec09b90bbcc7284f008599479ba52c240
parent fb1bdf0ffc06e872533230ccfe7de4fc0e706eea

Merge "Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials" into lmp-mr1-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d73e9c3..7fb2603 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1112,7 +1112,8 @@
 
         <!-- Lock screen settings -->
         <activity android:name="ConfirmDeviceCredentialActivity"
-            android:exported="true">
+            android:exported="true"
+            android:theme="@style/Transparent">
             <intent-filter>
                 <action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL" />
                 <category android:name="android.intent.category.DEFAULT" />

src/com/android/settings/sim/SimDialogActivity.java

diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java
index 0964f10..3170dae 100644
--- a/src/com/android/settings/sim/SimDialogActivity.java
+++ b/src/com/android/settings/sim/SimDialogActivity.java
@@ -219,7 +219,10 @@
                 final PhoneAccount phoneAccount =
                         telecomManager.getPhoneAccount(phoneAccounts.next());
                 list.add((String)phoneAccount.getLabel());
-                if (phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION)) {
+                // Added check to add entry into callsSubInforList only if phoneAccountId is int
+                // Todo : Might have to change it later based on b/18904714
+                if (phoneAccount.hasCapabilities(PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION) &&
+                        TextUtils.isDigitsOnly(phoneAccount.getAccountHandle().getId())) {
                     final String phoneAccountId = phoneAccount.getAccountHandle().getId();
                     final SubscriptionInfo sir = Utils.findRecordBySubId(context,
                             Integer.parseInt(phoneAccountId));