Revert "telephony: Set roam though same named operator"
Vineeta Srivastava [Thu, 26 Sep 2013 19:34:39 +0000 (19:34 +0000)]
This reverts commit ce0eb1a929a8abb9a99b042813e403b0d6f74fdd.

Change-Id: I324343a218e155ece9f8243cdc44ce9fffe8e5d5

src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java

index 5884aeb..ca1e08d 100644 (file)
@@ -746,8 +746,7 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
              * agreements and MVNO's.
              */
             boolean roaming = (mGsmRoaming || mDataRoaming);
-            if ((mGsmRoaming && isSameNamedOperators(mNewSS)
-                        && !isSameNamedOperatorConsideredRoaming(mNewSS))
+            if ((mGsmRoaming && isSameNamedOperators(mNewSS))
                     || isOperatorConsideredNonRoaming(mNewSS)) {
                 roaming = false;
             }
@@ -1373,23 +1372,6 @@ final class GsmServiceStateTracker extends ServiceStateTracker {
         return false;
     }
 
-    private boolean isSameNamedOperatorConsideredRoaming(ServiceState s) {
-        String operatorNumeric = s.getOperatorNumeric();
-        String[] numericArray = mPhone.getContext().getResources().getStringArray(
-                    com.android.internal.R.array.config_sameNamedOperatorConsideredRoaming);
-
-        if (numericArray.length == 0 || operatorNumeric == null)
-            return false;
-
-        for (String numeric : numericArray) {
-            if (operatorNumeric.startsWith(numeric))
-                return true;
-            else
-                return false;
-        }
-        return false;
-    }
-
     /**
      * @return The current GPRS state. IN_SERVICE is the same as "attached"
      * and OUT_OF_SERVICE is the same as detached.