Merge "Refactor Cell Location public API." into jb-mr1-dev (8a06969d) · Commits · e / os / android_frameworks_base

api/current.txt

+20 −21

Original line number	Diff line number	Diff line
		@@ -20637,66 +20637,65 @@ package android.speech.tts {

		package android.telephony {

		public abstract class CellIdentity implements android.os.Parcelable {
		public final class CellIdentityCdma implements android.os.Parcelable {
		method public int describeContents();
		method public abstract int hashCode();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator CREATOR;
		}

		public final class CellIdentityCdma extends android.telephony.CellIdentity implements android.os.Parcelable {
		method public int getBasestationId();
		method public int getLatitude();
		method public int getLongitude();
		method public int getNetworkId();
		method public int getSystemId();
		method public int hashCode();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator CREATOR;
		}

		public final class CellIdentityGsm extends android.telephony.CellIdentity implements android.os.Parcelable {
		public final class CellIdentityGsm implements android.os.Parcelable {
		method public int describeContents();
		method public int getCid();
		method public int getLac();
		method public int getMcc();
		method public int getMnc();
		method public int getPsc();
		method public int hashCode();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator CREATOR;
		}

		public final class CellIdentityLte extends android.telephony.CellIdentity implements android.os.Parcelable {
		public final class CellIdentityLte implements android.os.Parcelable {
		method public int describeContents();
		method public int getCi();
		method public int getMcc();
		method public int getMnc();
		method public int getPci();
		method public int getTac();
		method public int hashCode();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator CREATOR;
		}

		public class CellInfo implements android.os.Parcelable {
		public abstract class CellInfo implements android.os.Parcelable {
		method public int describeContents();
		method public long getTimeStamp();
		method public boolean isRegistered();
		method public void writeToParcel(android.os.Parcel, int);
		method public abstract void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator CREATOR;
		}

		public final class CellInfoCdma extends android.telephony.CellInfo implements android.os.Parcelable {
		method public android.telephony.CellIdentityCdma getCellIdentity();
		method public android.telephony.CellSignalStrengthCdma getCellSignalStrength();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator CREATOR;
		}

		public final class CellInfoGsm extends android.telephony.CellInfo implements android.os.Parcelable {
		method public android.telephony.CellIdentityGsm getCellIdentity();
		method public android.telephony.CellSignalStrengthGsm getCellSignalStrength();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator CREATOR;
		}

		public final class CellInfoLte extends android.telephony.CellInfo implements android.os.Parcelable {
		method public android.telephony.CellIdentityLte getCellIdentity();
		method public android.telephony.CellSignalStrengthLte getCellSignalStrength();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator CREATOR;
		}

		@@ -20706,18 +20705,16 @@ package android.telephony {
		method public static void requestLocationUpdate();
		}

		public abstract class CellSignalStrength implements android.os.Parcelable {
		method public int describeContents();
		public abstract class CellSignalStrength {
		method public abstract boolean equals(java.lang.Object);
		method public abstract int getAsuLevel();
		method public abstract int getDbm();
		method public abstract int getLevel();
		method public abstract int hashCode();
		method public abstract void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator CREATOR;
		}

		public class CellSignalStrengthCdma extends android.telephony.CellSignalStrength implements android.os.Parcelable {
		public final class CellSignalStrengthCdma extends android.telephony.CellSignalStrength implements android.os.Parcelable {
		method public int describeContents();
		method public boolean equals(java.lang.Object);
		method public int getAsuLevel();
		method public int getCdmaDbm();
		@@ -20734,7 +20731,8 @@ package android.telephony {
		field public static final android.os.Parcelable.Creator CREATOR;
		}

		public class CellSignalStrengthGsm extends android.telephony.CellSignalStrength implements android.os.Parcelable {
		public final class CellSignalStrengthGsm extends android.telephony.CellSignalStrength implements android.os.Parcelable {
		method public int describeContents();
		method public boolean equals(java.lang.Object);
		method public int getAsuLevel();
		method public int getDbm();
		@@ -20744,7 +20742,8 @@ package android.telephony {
		field public static final android.os.Parcelable.Creator CREATOR;
		}

		public class CellSignalStrengthLte extends android.telephony.CellSignalStrength implements android.os.Parcelable {
		public final class CellSignalStrengthLte extends android.telephony.CellSignalStrength implements android.os.Parcelable {
		method public int describeContents();
		method public boolean equals(java.lang.Object);
		method public int getAsuLevel();
		method public int getDbm();

telephony/java/android/telephony/CellIdentity.java

deleted100644 → 0

+0 −102

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2012 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.telephony;

		import android.os.Parcel;
		import android.os.Parcelable;

		/**
		* CellIdentity is immutable and represents ONE unique cell in the world
		* it contains all levels of info to identity country, carrier, etc.
		*/
		public abstract class CellIdentity implements Parcelable {

		// Type fields for parceling
		/** @hide */
		protected static final int TYPE_GSM = 1;
		/** @hide */
		protected static final int TYPE_CDMA = 2;
		/** @hide */
		protected static final int TYPE_LTE = 3;

		/** @hide */
		protected CellIdentity() {
		}

		/** @hide */
		protected CellIdentity(Parcel in) {
		}

		/** @hide */
		protected CellIdentity(CellIdentity cid) {
		}

		/**
		* @return a copy of this object with package visibility.
		*/
		abstract CellIdentity copy();

		@Override
		public abstract int hashCode();

		@Override
		public boolean equals(Object other) {
		if (other == null) {
		return false;
		}
		if (this == other) {
		return true;
		}
		return (other instanceof CellIdentity);
		}

		@Override
		public String toString() {
		return "";
		}

		/** Implement the Parcelable interface */
		@Override
		public int describeContents() {
		return 0;
		}

		/** Implement the Parcelable interface */
		@Override
		public void writeToParcel(Parcel dest, int flags) {
		}

		/** Implement the Parcelable interface */
		public static final Creator<CellIdentity> CREATOR =
		new Creator<CellIdentity>() {
		@Override
		public CellIdentity createFromParcel(Parcel in) {
		int type = in.readInt();
		switch (type) {
		case TYPE_GSM: return CellIdentityGsm.createFromParcelBody(in);
		case TYPE_CDMA: return CellIdentityCdma.createFromParcelBody(in);
		case TYPE_LTE: return CellIdentityLte.createFromParcelBody(in);
		default: throw new RuntimeException("Bad CellIdentity Parcel");
		}
		}

		@Override
		public CellIdentity[] newArray(int size) {
		return new CellIdentity[size];
		}
		};
		}

telephony/java/android/telephony/CellIdentityCdma.java

+2 −13

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ import android.util.Log;
		/**
		* CellIdentity is to represent a unique CDMA cell
		*/
		public final class CellIdentityCdma extends CellIdentity implements Parcelable {
		public final class CellIdentityCdma implements Parcelable {

		private static final String LOG_TAG = "CellSignalStrengthCdma";
		private static final boolean DBG = false;
		@@ -81,7 +81,6 @@ public final class CellIdentityCdma extends CellIdentity implements Parcelable {
		}

		private CellIdentityCdma(CellIdentityCdma cid) {
		super(cid);
		mNetworkId = cid.mNetworkId;
		mSystemId = cid.mSystemId;
		mBasestationId = cid.mBasestationId;
		@@ -89,7 +88,6 @@ public final class CellIdentityCdma extends CellIdentity implements Parcelable {
		mLatitude = cid.mLatitude;
		}

		@Override
		CellIdentityCdma copy() {
		return new CellIdentityCdma(this);
		}
		@@ -185,8 +183,6 @@ public final class CellIdentityCdma extends CellIdentity implements Parcelable {
		@Override
		public void writeToParcel(Parcel dest, int flags) {
		if (DBG) log("writeToParcel(Parcel, int): " + toString());
		dest.writeInt(TYPE_CDMA);
		super.writeToParcel(dest, flags);
		dest.writeInt(mNetworkId);
		dest.writeInt(mSystemId);
		dest.writeInt(mBasestationId);
		@@ -196,7 +192,6 @@ public final class CellIdentityCdma extends CellIdentity implements Parcelable {

		/** Construct from Parcel, type has already been processed */
		private CellIdentityCdma(Parcel in) {
		super(in);
		mNetworkId = in.readInt();
		mSystemId = in.readInt();
		mBasestationId = in.readInt();
		@@ -211,8 +206,7 @@ public final class CellIdentityCdma extends CellIdentity implements Parcelable {
		new Creator<CellIdentityCdma>() {
		@Override
		public CellIdentityCdma createFromParcel(Parcel in) {
		in.readInt(); // Skip past token, we know what it is
		return createFromParcelBody(in);
		return new CellIdentityCdma(in);
		}

		@Override
		@@ -221,11 +215,6 @@ public final class CellIdentityCdma extends CellIdentity implements Parcelable {
		}
		};

		/** @hide */
		static CellIdentityCdma createFromParcelBody(Parcel in) {
		return new CellIdentityCdma(in);
		}

		/**
		* log
		*/

telephony/java/android/telephony/CellIdentityGsm.java

+2 −13

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ import android.util.Log;
		/**
		* CellIdentity to represent a unique GSM or UMTS cell
		*/
		public final class CellIdentityGsm extends CellIdentity implements Parcelable {
		public final class CellIdentityGsm implements Parcelable {

		private static final String LOG_TAG = "CellIdentityGsm";
		private static final boolean DBG = false;
		@@ -69,7 +69,6 @@ public final class CellIdentityGsm extends CellIdentity implements Parcelable {
		}

		private CellIdentityGsm(CellIdentityGsm cid) {
		super(cid);
		mMcc = cid.mMcc;
		mMnc = cid.mMnc;
		mLac = cid.mLac;
		@@ -77,7 +76,6 @@ public final class CellIdentityGsm extends CellIdentity implements Parcelable {
		mPsc = cid.mPsc;
		}

		@Override
		CellIdentityGsm copy() {
		return new CellIdentityGsm(this);
		}
		@@ -170,8 +168,6 @@ public final class CellIdentityGsm extends CellIdentity implements Parcelable {
		@Override
		public void writeToParcel(Parcel dest, int flags) {
		if (DBG) log("writeToParcel(Parcel, int): " + toString());
		dest.writeInt(TYPE_GSM);
		super.writeToParcel(dest, flags);
		dest.writeInt(mMcc);
		dest.writeInt(mMnc);
		dest.writeInt(mLac);
		@@ -181,7 +177,6 @@ public final class CellIdentityGsm extends CellIdentity implements Parcelable {

		/** Construct from Parcel, type has already been processed */
		private CellIdentityGsm(Parcel in) {
		super(in);
		mMcc = in.readInt();
		mMnc = in.readInt();
		mLac = in.readInt();
		@@ -196,8 +191,7 @@ public final class CellIdentityGsm extends CellIdentity implements Parcelable {
		new Creator<CellIdentityGsm>() {
		@Override
		public CellIdentityGsm createFromParcel(Parcel in) {
		in.readInt(); // Skip past token, we know what it is
		return createFromParcelBody(in);
		return new CellIdentityGsm(in);
		}

		@Override
		@@ -206,11 +200,6 @@ public final class CellIdentityGsm extends CellIdentity implements Parcelable {
		}
		};

		/** @hide */
		static CellIdentityGsm createFromParcelBody(Parcel in) {
		return new CellIdentityGsm(in);
		}

		/**
		* log
		*/

telephony/java/android/telephony/CellIdentityLte.java

+2 −13

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ import android.util.Log;
		/**
		* CellIdentity is to represent a unique LTE cell
		*/
		public final class CellIdentityLte extends CellIdentity implements Parcelable {
		public final class CellIdentityLte implements Parcelable {

		private static final String LOG_TAG = "CellIdentityLte";
		private static final boolean DBG = false;
		@@ -69,7 +69,6 @@ public final class CellIdentityLte extends CellIdentity implements Parcelable {
		}

		private CellIdentityLte(CellIdentityLte cid) {
		super(cid);
		mMcc = cid.mMcc;
		mMnc = cid.mMnc;
		mCi = cid.mCi;
		@@ -77,7 +76,6 @@ public final class CellIdentityLte extends CellIdentity implements Parcelable {
		mTac = cid.mTac;
		}

		@Override
		CellIdentityLte copy() {
		return new CellIdentityLte(this);
		}
		@@ -165,8 +163,6 @@ public final class CellIdentityLte extends CellIdentity implements Parcelable {
		@Override
		public void writeToParcel(Parcel dest, int flags) {
		if (DBG) log("writeToParcel(Parcel, int): " + toString());
		dest.writeInt(TYPE_LTE);
		super.writeToParcel(dest, flags);
		dest.writeInt(mMcc);
		dest.writeInt(mMnc);
		dest.writeInt(mCi);
		@@ -176,7 +172,6 @@ public final class CellIdentityLte extends CellIdentity implements Parcelable {

		/** Construct from Parcel, type has already been processed */
		private CellIdentityLte(Parcel in) {
		super(in);
		mMcc = in.readInt();
		mMnc = in.readInt();
		mCi = in.readInt();
		@@ -191,8 +186,7 @@ public final class CellIdentityLte extends CellIdentity implements Parcelable {
		new Creator<CellIdentityLte>() {
		@Override
		public CellIdentityLte createFromParcel(Parcel in) {
		in.readInt(); // Skip past token, we know what it is
		return createFromParcelBody(in);
		return new CellIdentityLte(in);
		}

		@Override
		@@ -201,11 +195,6 @@ public final class CellIdentityLte extends CellIdentity implements Parcelable {
		}
		};

		/** @hide */
		static CellIdentityLte createFromParcelBody(Parcel in) {
		return new CellIdentityLte(in);
		}

		/**
		* log
		*/