Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04fbcc90 authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Deprecated getDeviceId and added getMeid and getImei" am: 1cb7194e 

am: a02cff1d

Change-Id: I5df6eba37779731cdf924e19c43385fadbf234d3
parents ac7ca0f9 a02cff1d

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+13 −18
Original line number Diff line number Diff line
@@ -16,6 +16,18 @@ 


package com.android.internal.telephony;



import static com.android.internal.telephony.CommandsInterface.CF_ACTION_DISABLE;

import static com.android.internal.telephony.CommandsInterface.CF_ACTION_ENABLE;

import static com.android.internal.telephony.CommandsInterface.CF_ACTION_ERASURE;

import static com.android.internal.telephony.CommandsInterface.CF_ACTION_REGISTRATION;

import static com.android.internal.telephony.CommandsInterface.CF_REASON_ALL;

import static com.android.internal.telephony.CommandsInterface.CF_REASON_ALL_CONDITIONAL;

import static com.android.internal.telephony.CommandsInterface.CF_REASON_BUSY;

import static com.android.internal.telephony.CommandsInterface.CF_REASON_NOT_REACHABLE;

import static com.android.internal.telephony.CommandsInterface.CF_REASON_NO_REPLY;

import static com.android.internal.telephony.CommandsInterface.CF_REASON_UNCONDITIONAL;

import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_VOICE;



import android.app.ActivityManagerNative;

import android.content.BroadcastReceiver;

import android.content.ContentValues;
@@ -79,18 +91,6 @@ import java.util.List; 
import java.util.regex.Matcher;

import java.util.regex.Pattern;



import static com.android.internal.telephony.CommandsInterface.CF_ACTION_DISABLE;

import static com.android.internal.telephony.CommandsInterface.CF_ACTION_ENABLE;

import static com.android.internal.telephony.CommandsInterface.CF_ACTION_ERASURE;

import static com.android.internal.telephony.CommandsInterface.CF_ACTION_REGISTRATION;

import static com.android.internal.telephony.CommandsInterface.CF_REASON_ALL;

import static com.android.internal.telephony.CommandsInterface.CF_REASON_ALL_CONDITIONAL;

import static com.android.internal.telephony.CommandsInterface.CF_REASON_BUSY;

import static com.android.internal.telephony.CommandsInterface.CF_REASON_NOT_REACHABLE;

import static com.android.internal.telephony.CommandsInterface.CF_REASON_NO_REPLY;

import static com.android.internal.telephony.CommandsInterface.CF_REASON_UNCONDITIONAL;

import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_VOICE;



/**

 * {@hide}

 */
@@ -1434,13 +1434,8 @@ public class GsmCdmaPhone extends Phone { 


    @Override

    public String getMeid() {

        if (isPhoneTypeGsm()) {

            loge("[GsmCdmaPhone] getMeid() is a CDMA method");

            return "0";

        } else {

        return mMeid;

    }

    }



    @Override

    public String getNai() {