From d44d16f7003a57eb4ac99d4730fa4d5a0f0474c8 Mon Sep 17 00:00:00 2001 From: Narayan Kamath Date: Tue, 26 Jan 2016 09:44:54 +0000 Subject: [PATCH] Revert "Cellinfo: Update to version 12" This reverts commit aa2be45a560b37c5249600667ee36a9f156515c2. Change-Id: I5cc76b15b311e47bc5a892704930d218c9f72b0d --- api/current.txt | 4 -- api/system-current.txt | 4 -- .../android/telephony/CellIdentityGsm.java | 50 +------------------ .../android/telephony/CellIdentityLte.java | 33 +----------- .../android/telephony/CellIdentityWcdma.java | 33 +----------- .../telephony/CellSignalStrengthGsm.java | 27 +--------- 6 files changed, 5 insertions(+), 146 deletions(-) diff --git a/api/current.txt b/api/current.txt index 43a658b9b4a37..6f023c17e30b3 100644 --- a/api/current.txt +++ b/api/current.txt @@ -30673,8 +30673,6 @@ package android.telephony { public final class CellIdentityGsm implements android.os.Parcelable { method public int describeContents(); - method public int getArfcn(); - method public int getBsic(); method public int getCid(); method public int getLac(); method public int getMcc(); @@ -30687,7 +30685,6 @@ package android.telephony { public final class CellIdentityLte implements android.os.Parcelable { method public int describeContents(); method public int getCi(); - method public int getEarfcn(); method public int getMcc(); method public int getMnc(); method public int getPci(); @@ -30703,7 +30700,6 @@ package android.telephony { method public int getMcc(); method public int getMnc(); method public int getPsc(); - method public int getUarfcn(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator CREATOR; } diff --git a/api/system-current.txt b/api/system-current.txt index a64674d00aa20..c91a9678f1d06 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -32919,8 +32919,6 @@ package android.telephony { public final class CellIdentityGsm implements android.os.Parcelable { method public int describeContents(); - method public int getArfcn(); - method public int getBsic(); method public int getCid(); method public int getLac(); method public int getMcc(); @@ -32933,7 +32931,6 @@ package android.telephony { public final class CellIdentityLte implements android.os.Parcelable { method public int describeContents(); method public int getCi(); - method public int getEarfcn(); method public int getMcc(); method public int getMnc(); method public int getPci(); @@ -32949,7 +32946,6 @@ package android.telephony { method public int getMcc(); method public int getMnc(); method public int getPsc(); - method public int getUarfcn(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator CREATOR; } diff --git a/telephony/java/android/telephony/CellIdentityGsm.java b/telephony/java/android/telephony/CellIdentityGsm.java index 74f11719d237e..90d2aa0223a09 100644 --- a/telephony/java/android/telephony/CellIdentityGsm.java +++ b/telephony/java/android/telephony/CellIdentityGsm.java @@ -38,10 +38,6 @@ public final class CellIdentityGsm implements Parcelable { private final int mLac; // 16-bit GSM Cell Identity described in TS 27.007, 0..65535 private final int mCid; - // 16-bit GSM Absolute RF Channel Number - private final int mArfcn; - // 6-bit Base Station Identity Code - private final int mBsic; /** * @hide @@ -51,8 +47,6 @@ public final class CellIdentityGsm implements Parcelable { mMnc = Integer.MAX_VALUE; mLac = Integer.MAX_VALUE; mCid = Integer.MAX_VALUE; - mArfcn = Integer.MAX_VALUE; - mBsic = Integer.MAX_VALUE; } /** * public constructor @@ -64,27 +58,10 @@ public final class CellIdentityGsm implements Parcelable { * @hide */ public CellIdentityGsm (int mcc, int mnc, int lac, int cid) { - this(mcc, mnc, lac, cid, Integer.MAX_VALUE, Integer.MAX_VALUE); - } - - /** - * public constructor - * @param mcc 3-digit Mobile Country Code, 0..999 - * @param mnc 2 or 3-digit Mobile Network Code, 0..999 - * @param lac 16-bit Location Area Code, 0..65535 - * @param cid 16-bit GSM Cell Identity or 28-bit UMTS Cell Identity - * @param arfcn 16-bit GSM Absolute RF Channel Number - * @param bsic 6-bit Base Station Identity Code - * - * @hide - */ - public CellIdentityGsm (int mcc, int mnc, int lac, int cid, int arfcn, int bsic) { mMcc = mcc; mMnc = mnc; mLac = lac; mCid = cid; - mArfcn = arfcn; - mBsic = bsic; } private CellIdentityGsm(CellIdentityGsm cid) { @@ -92,8 +69,6 @@ public final class CellIdentityGsm implements Parcelable { mMnc = cid.mMnc; mLac = cid.mLac; mCid = cid.mCid; - mArfcn = cid.mArfcn; - mBsic = cid.mBsic; } CellIdentityGsm copy() { @@ -130,21 +105,6 @@ public final class CellIdentityGsm implements Parcelable { return mCid; } - /** - * @return 16-bit GSM Absolute RF Channel Number, Integer.MAX_VALUE if unknown - */ - public int getArfcn() { - return mArfcn; - } - - /** - * @return 6-bit Base Station Identity Code, Integer.MAX_VALUE if unknown - */ - public int getBsic() { - return mBsic; - } - - /** * @return Integer.MAX_VALUE, undefined for GSM */ @@ -172,9 +132,7 @@ public final class CellIdentityGsm implements Parcelable { return mMcc == o.mMcc && mMnc == o.mMnc && mLac == o.mLac && - mCid == o.mCid && - mArfcn == o.mArfcn && - mBsic == o.mBsic; + mCid == o.mCid; } @Override @@ -184,8 +142,6 @@ public final class CellIdentityGsm implements Parcelable { sb.append(" mMnc=").append(mMnc); sb.append(" mLac=").append(mLac); sb.append(" mCid=").append(mCid); - sb.append(" mArfcn=").append(mArfcn); - sb.append(" mBsic=").append("0x").append(Integer.toHexString(mBsic)); sb.append("}"); return sb.toString(); @@ -205,8 +161,6 @@ public final class CellIdentityGsm implements Parcelable { dest.writeInt(mMnc); dest.writeInt(mLac); dest.writeInt(mCid); - dest.writeInt(mArfcn); - dest.writeInt(mBsic); } /** Construct from Parcel, type has already been processed */ @@ -215,8 +169,6 @@ public final class CellIdentityGsm implements Parcelable { mMnc = in.readInt(); mLac = in.readInt(); mCid = in.readInt(); - mArfcn = in.readInt(); - mBsic = in.readInt(); if (DBG) log("CellIdentityGsm(Parcel): " + toString()); } diff --git a/telephony/java/android/telephony/CellIdentityLte.java b/telephony/java/android/telephony/CellIdentityLte.java index ce7438354a50f..1e7ac08b3e433 100644 --- a/telephony/java/android/telephony/CellIdentityLte.java +++ b/telephony/java/android/telephony/CellIdentityLte.java @@ -40,8 +40,6 @@ public final class CellIdentityLte implements Parcelable { private final int mPci; // 16-bit tracking area code private final int mTac; - // 18-bit Absolute RF Channel Number - private final int mEarfcn; /** * @hide @@ -52,7 +50,6 @@ public final class CellIdentityLte implements Parcelable { mCi = Integer.MAX_VALUE; mPci = Integer.MAX_VALUE; mTac = Integer.MAX_VALUE; - mEarfcn = Integer.MAX_VALUE; } /** @@ -66,27 +63,11 @@ public final class CellIdentityLte implements Parcelable { * @hide */ public CellIdentityLte (int mcc, int mnc, int ci, int pci, int tac) { - this(mcc, mnc, ci, pci, tac, Integer.MAX_VALUE); - } - - /** - * - * @param mcc 3-digit Mobile Country Code, 0..999 - * @param mnc 2 or 3-digit Mobile Network Code, 0..999 - * @param ci 28-bit Cell Identity - * @param pci Physical Cell Id 0..503 - * @param tac 16-bit Tracking Area Code - * @param earfcn 18-bit LTE Absolute RF Channel Number - * - * @hide - */ - public CellIdentityLte (int mcc, int mnc, int ci, int pci, int tac, int earfcn) { mMcc = mcc; mMnc = mnc; mCi = ci; mPci = pci; mTac = tac; - mEarfcn = earfcn; } private CellIdentityLte(CellIdentityLte cid) { @@ -95,7 +76,6 @@ public final class CellIdentityLte implements Parcelable { mCi = cid.mCi; mPci = cid.mPci; mTac = cid.mTac; - mEarfcn = cid.mEarfcn; } CellIdentityLte copy() { @@ -137,13 +117,6 @@ public final class CellIdentityLte implements Parcelable { return mTac; } - /** - * @return 18-bit Absolute RF Channel Number, Integer.MAX_VALUE if unknown - */ - public int getEarfcn() { - return mEarfcn; - } - @Override public int hashCode() { return Objects.hash(mMcc, mMnc, mCi, mPci, mTac); @@ -164,8 +137,7 @@ public final class CellIdentityLte implements Parcelable { mMnc == o.mMnc && mCi == o.mCi && mPci == o.mPci && - mTac == o.mTac && - mEarfcn == o.mEarfcn; + mTac == o.mTac; } @Override @@ -176,7 +148,6 @@ public final class CellIdentityLte implements Parcelable { sb.append(" mCi="); sb.append(mCi); sb.append(" mPci="); sb.append(mPci); sb.append(" mTac="); sb.append(mTac); - sb.append(" mEarfcn="); sb.append(mEarfcn); sb.append("}"); return sb.toString(); @@ -197,7 +168,6 @@ public final class CellIdentityLte implements Parcelable { dest.writeInt(mCi); dest.writeInt(mPci); dest.writeInt(mTac); - dest.writeInt(mEarfcn); } /** Construct from Parcel, type has already been processed */ @@ -207,7 +177,6 @@ public final class CellIdentityLte implements Parcelable { mCi = in.readInt(); mPci = in.readInt(); mTac = in.readInt(); - mEarfcn = in.readInt(); if (DBG) log("CellIdentityLte(Parcel): " + toString()); } diff --git a/telephony/java/android/telephony/CellIdentityWcdma.java b/telephony/java/android/telephony/CellIdentityWcdma.java index 0d13efd279c97..56ee8c9df1381 100644 --- a/telephony/java/android/telephony/CellIdentityWcdma.java +++ b/telephony/java/android/telephony/CellIdentityWcdma.java @@ -40,8 +40,6 @@ public final class CellIdentityWcdma implements Parcelable { private final int mCid; // 9-bit UMTS Primary Scrambling Code described in TS 25.331, 0..511 private final int mPsc; - // 16-bit UMTS Absolute RF Channel Number - private final int mUarfcn; /** * @hide @@ -52,7 +50,6 @@ public final class CellIdentityWcdma implements Parcelable { mLac = Integer.MAX_VALUE; mCid = Integer.MAX_VALUE; mPsc = Integer.MAX_VALUE; - mUarfcn = Integer.MAX_VALUE; } /** * public constructor @@ -65,27 +62,11 @@ public final class CellIdentityWcdma implements Parcelable { * @hide */ public CellIdentityWcdma (int mcc, int mnc, int lac, int cid, int psc) { - this(mcc, mnc, lac, cid, psc, Integer.MAX_VALUE); - } - - /** - * public constructor - * @param mcc 3-digit Mobile Country Code, 0..999 - * @param mnc 2 or 3-digit Mobile Network Code, 0..999 - * @param lac 16-bit Location Area Code, 0..65535 - * @param cid 28-bit UMTS Cell Identity - * @param psc 9-bit UMTS Primary Scrambling Code - * @param uarfcn 16-bit UMTS Absolute RF Channel Number - * - * @hide - */ - public CellIdentityWcdma (int mcc, int mnc, int lac, int cid, int psc, int uarfcn) { mMcc = mcc; mMnc = mnc; mLac = lac; mCid = cid; mPsc = psc; - mUarfcn = uarfcn; } private CellIdentityWcdma(CellIdentityWcdma cid) { @@ -94,7 +75,6 @@ public final class CellIdentityWcdma implements Parcelable { mLac = cid.mLac; mCid = cid.mCid; mPsc = cid.mPsc; - mUarfcn = cid.mUarfcn; } CellIdentityWcdma copy() { @@ -143,13 +123,6 @@ public final class CellIdentityWcdma implements Parcelable { return Objects.hash(mMcc, mMnc, mLac, mCid, mPsc); } - /** - * @return 16-bit UMTS Absolute RF Channel Number, Integer.MAX_VALUE if unknown - */ - public int getUarfcn() { - return mUarfcn; - } - @Override public boolean equals(Object other) { if (this == other) { @@ -165,8 +138,7 @@ public final class CellIdentityWcdma implements Parcelable { mMnc == o.mMnc && mLac == o.mLac && mCid == o.mCid && - mPsc == o.mPsc && - mUarfcn == o.mUarfcn; + mPsc == o.mPsc; } @Override @@ -177,7 +149,6 @@ public final class CellIdentityWcdma implements Parcelable { sb.append(" mLac=").append(mLac); sb.append(" mCid=").append(mCid); sb.append(" mPsc=").append(mPsc); - sb.append(" mUarfcn=").append(mUarfcn); sb.append("}"); return sb.toString(); @@ -198,7 +169,6 @@ public final class CellIdentityWcdma implements Parcelable { dest.writeInt(mLac); dest.writeInt(mCid); dest.writeInt(mPsc); - dest.writeInt(mUarfcn); } /** Construct from Parcel, type has already been processed */ @@ -208,7 +178,6 @@ public final class CellIdentityWcdma implements Parcelable { mLac = in.readInt(); mCid = in.readInt(); mPsc = in.readInt(); - mUarfcn = in.readInt(); if (DBG) log("CellIdentityWcdma(Parcel): " + toString()); } diff --git a/telephony/java/android/telephony/CellSignalStrengthGsm.java b/telephony/java/android/telephony/CellSignalStrengthGsm.java index addf7ef025aaa..d27fcec38351f 100644 --- a/telephony/java/android/telephony/CellSignalStrengthGsm.java +++ b/telephony/java/android/telephony/CellSignalStrengthGsm.java @@ -34,7 +34,6 @@ public final class CellSignalStrengthGsm extends CellSignalStrength implements P private int mSignalStrength; // Valid values are (0-31, 99) as defined in TS 27.007 8.5 private int mBitErrorRate; // bit error rate (0-7, 99) as defined in TS 27.007 8.5 - private int mTimingAdvance; /** * Empty constructor @@ -76,22 +75,6 @@ public final class CellSignalStrengthGsm extends CellSignalStrength implements P public void initialize(int ss, int ber) { mSignalStrength = ss; mBitErrorRate = ber; - mTimingAdvance = Integer.MAX_VALUE; - } - - /** - * Initialize all the values - * - * @param ss SignalStrength as ASU value - * @param ber is Bit Error Rate - * @param ta timing advance - * - * @hide - */ - public void initialize(int ss, int ber, int ta) { - mSignalStrength = ss; - mBitErrorRate = ber; - mTimingAdvance = ta; } /** @@ -100,7 +83,6 @@ public final class CellSignalStrengthGsm extends CellSignalStrength implements P protected void copyFrom(CellSignalStrengthGsm s) { mSignalStrength = s.mSignalStrength; mBitErrorRate = s.mBitErrorRate; - mTimingAdvance = s.mTimingAdvance; } /** @@ -116,7 +98,6 @@ public final class CellSignalStrengthGsm extends CellSignalStrength implements P public void setDefaultValues() { mSignalStrength = Integer.MAX_VALUE; mBitErrorRate = Integer.MAX_VALUE; - mTimingAdvance = Integer.MAX_VALUE; } /** @@ -193,8 +174,7 @@ public final class CellSignalStrengthGsm extends CellSignalStrength implements P return false; } - return mSignalStrength == s.mSignalStrength && mBitErrorRate == s.mBitErrorRate && - s.mTimingAdvance == mTimingAdvance; + return mSignalStrength == s.mSignalStrength && mBitErrorRate == s.mBitErrorRate; } /** @@ -204,8 +184,7 @@ public final class CellSignalStrengthGsm extends CellSignalStrength implements P public String toString() { return "CellSignalStrengthGsm:" + " ss=" + mSignalStrength - + " ber=" + mBitErrorRate - + " mTa=" + mTimingAdvance; + + " ber=" + mBitErrorRate; } /** Implement the Parcelable interface */ @@ -214,7 +193,6 @@ public final class CellSignalStrengthGsm extends CellSignalStrength implements P if (DBG) log("writeToParcel(Parcel, int): " + toString()); dest.writeInt(mSignalStrength); dest.writeInt(mBitErrorRate); - dest.writeInt(mTimingAdvance); } /** @@ -224,7 +202,6 @@ public final class CellSignalStrengthGsm extends CellSignalStrength implements P private CellSignalStrengthGsm(Parcel in) { mSignalStrength = in.readInt(); mBitErrorRate = in.readInt(); - mTimingAdvance = in.readInt(); if (DBG) log("CellSignalStrengthGsm(Parcel): " + toString()); }