Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Construct NeighboringCellInfo from CellInfo"

Browse Source 
am: 9257722c5c

Change-Id: I36989f4d0b13c36f8a7209eea0f5827e6a54c879
This commit is contained in:
Nathan Harold
2018-08-09 16:19:20 -07:00
committed by android-build-merger
parent 24fd6dd4d6 9257722c5c
commit 921acac430
2 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
telephony/java/android/telephony/NeighboringCellInfo.java
View File

@@ -16,16 +16,16 @@
package android.telephony; package android.telephony;
import android.os.Parcel;
import android.os.Parcelable;
import static android.telephony.TelephonyManager.NETWORK_TYPE_UNKNOWN;
import static android.telephony.TelephonyManager.NETWORK_TYPE_EDGE; import static android.telephony.TelephonyManager.NETWORK_TYPE_EDGE;
import static android.telephony.TelephonyManager.NETWORK_TYPE_GPRS; import static android.telephony.TelephonyManager.NETWORK_TYPE_GPRS;
import static android.telephony.TelephonyManager.NETWORK_TYPE_UMTS;
import static android.telephony.TelephonyManager.NETWORK_TYPE_HSDPA; import static android.telephony.TelephonyManager.NETWORK_TYPE_HSDPA;
import static android.telephony.TelephonyManager.NETWORK_TYPE_HSUPA;
import static android.telephony.TelephonyManager.NETWORK_TYPE_HSPA; import static android.telephony.TelephonyManager.NETWORK_TYPE_HSPA;
import static android.telephony.TelephonyManager.NETWORK_TYPE_HSUPA;
import static android.telephony.TelephonyManager.NETWORK_TYPE_UMTS;
import static android.telephony.TelephonyManager.NETWORK_TYPE_UNKNOWN;
import android.os.Parcel;
import android.os.Parcelable;
/** /**
@@ -100,6 +100,39 @@ public class NeighboringCellInfo implements Parcelable
mCid = cid; mCid = cid;
} }
/** @hide */
public NeighboringCellInfo(final CellInfoGsm info) {
mNetworkType = TelephonyManager.NETWORK_TYPE_GPRS;
mRssi = info.getCellSignalStrength().getAsuLevel();
if (mRssi == Integer.MAX_VALUE) mRssi = UNKNOWN_RSSI;
mLac = info.getCellIdentity().getLac();
if (mLac == Integer.MAX_VALUE) mLac = UNKNOWN_CID;
mCid = info.getCellIdentity().getCid();
if (mCid == Integer.MAX_VALUE) mCid = UNKNOWN_CID;
mPsc = UNKNOWN_CID;
}
/** @hide */
public NeighboringCellInfo(final CellInfoWcdma info) {
mNetworkType = TelephonyManager.NETWORK_TYPE_UMTS;
mRssi = info.getCellSignalStrength().getAsuLevel();
if (mRssi == Integer.MAX_VALUE) mRssi = UNKNOWN_RSSI;
mLac = info.getCellIdentity().getLac();
if (mLac == Integer.MAX_VALUE) mLac = UNKNOWN_CID;
mCid = info.getCellIdentity().getCid();
if (mCid == Integer.MAX_VALUE) mCid = UNKNOWN_CID;
mPsc = info.getCellIdentity().getPsc();
if (mPsc == Integer.MAX_VALUE) mPsc = UNKNOWN_CID;
}
/** /**
* Initialize the object from rssi, location string, and radioType * Initialize the object from rssi, location string, and radioType
* radioType is one of following * radioType is one of following

2
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -1528,7 +1528,7 @@ public class TelephonyManager {
* @return List of NeighboringCellInfo or null if info unavailable. * @return List of NeighboringCellInfo or null if info unavailable.
* *
* @deprecated Use {@link #getAllCellInfo} which returns a superset of the information * @deprecated Use {@link #getAllCellInfo} which returns a superset of the information
* from NeighboringCellInfo. * from NeighboringCellInfo, including LTE cell information.
*/ */
@Deprecated @Deprecated
@RequiresPermission(android.Manifest.permission.ACCESS_COARSE_LOCATION) @RequiresPermission(android.Manifest.permission.ACCESS_COARSE_LOCATION)