commit 6806b66ab7ca9821fe3e1123bf02faefa4781fa0
author Ihab Awad <ihab@google.com> Wed Jul 02 21:24:39 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 02 21:11:19 2014 +0000
tree 4ac4e8ef5fa26c2a3b708d916632b6ce1d722855
parent 81daeb069f60ad97d80823049aa34819463a8a28
parent c8daf202d6a3284b3ccb58efa7e4e67f6ac9343f

Merge "Fix references to two constants"

src/com/android/dialer/SpecialCharSequenceMgr.java

diff --git a/src/com/android/dialer/SpecialCharSequenceMgr.java b/src/com/android/dialer/SpecialCharSequenceMgr.java
index 9d622aa..4a6e4b2 100644
--- a/src/com/android/dialer/SpecialCharSequenceMgr.java
+++ b/src/com/android/dialer/SpecialCharSequenceMgr.java
@@ -20,7 +20,6 @@
 import android.app.KeyguardManager;
 import android.app.ProgressDialog;
 import android.content.ActivityNotFoundException;
-import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -28,8 +27,7 @@
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Looper;
-import android.os.RemoteException;
-import android.os.ServiceManager;
+import android.phone.PhoneManager;
 import android.provider.Settings;
 import android.telephony.PhoneNumberUtils;
 import android.telephony.TelephonyManager;
@@ -39,7 +37,6 @@
 import android.widget.Toast;
 
 import com.android.contacts.common.database.NoNullCursorAsyncQueryHandler;
-import com.android.internal.telephony.ITelephony;
 
 /**
  * Helper class to listen for some magic character sequences
@@ -228,13 +225,9 @@
 
     static boolean handlePinEntry(Context context, String input) {
         if ((input.startsWith("**04") || input.startsWith("**05")) && input.endsWith("#")) {
-            try {
-                return ITelephony.Stub.asInterface(ServiceManager.getService("phone"))
-                        .handlePinMmi(input);
-            } catch (RemoteException e) {
-                Log.e(TAG, "Failed to handlePinMmi due to remote exception");
-                return false;
-            }
+            PhoneManager phoneManager =
+                    (PhoneManager) context.getSystemService(Context.PHONE_SERVICE);
+            return phoneManager.handlePinMmi(input);
         }
         return false;
     }

src/com/android/dialer/list/ListsFragment.java

diff --git a/src/com/android/dialer/list/ListsFragment.java b/src/com/android/dialer/list/ListsFragment.java
index b50f94e..e94555e 100644
--- a/src/com/android/dialer/list/ListsFragment.java
+++ b/src/com/android/dialer/list/ListsFragment.java
@@ -141,8 +141,8 @@
             // slideOffset is 1 when the shortcut card is fully exposed, and 0 when completely
             // hidden.
             float ratioCardHidden = (1 - slideOffset) * 1.5f;
-            if (mShortcutCardsListView.getCount() > 0) {
-                SwipeableShortcutCard v =
+            if (mShortcutCardsListView.getChildCount() > 0) {
+                final SwipeableShortcutCard v =
                         (SwipeableShortcutCard) mShortcutCardsListView.getChildAt(0);
                 v.clipCard(ratioCardHidden);
             }
@@ -348,7 +348,7 @@
         mRemoveView.setAlpha(show ? 0 : 1);
         mRemoveView.animate().alpha(show ? 1 : 0).start();
 
-        if (mShortcutCardsListView.getCount() > 0) {
+        if (mShortcutCardsListView.getChildCount() > 0) {
             View v = mShortcutCardsListView.getChildAt(0);
             v.animate().withLayer()
                     .alpha(show ? REMOVE_VIEW_SHOWN_ALPHA : REMOVE_VIEW_HIDDEN_ALPHA)