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

Merge "Merge "Add CellInfo converter V1_4" am: 40aa75d3da am: 5e89327544" into pi-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2019-01-17 00:41:29 +00:00
committed by Android (Google) Code Review
parent f96ce761d0 8e9a9453d6
commit e49f842053
7 changed files with 69 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
telephony/java/android/telephony/CellConfigLte.java
View File

@@ -33,6 +33,11 @@ public class CellConfigLte implements Parcelable {
mIsEndcAvailable = false;
}
/** @hide */
public CellConfigLte(android.hardware.radio.V1_4.CellConfigLte cellConfig) {
mIsEndcAvailable = cellConfig.isEndcAvailable;
}
/** @hide */
public CellConfigLte(boolean isEndcAvailable) {
mIsEndcAvailable = isEndcAvailable;

22
telephony/java/android/telephony/CellInfo.java
View File

@@ -19,8 +19,10 @@ package android.telephony;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.UnsupportedAppUsage;
import android.hardware.radio.V1_4.CellInfo.Info;
import android.os.Parcel;
import android.os.Parcelable;
import android.os.SystemClock;
import com.android.internal.annotations.VisibleForTesting;
@@ -317,6 +319,13 @@ public abstract class CellInfo implements Parcelable {
this.mCellConnectionStatus = ci.connectionStatus;
}
/** @hide */
protected CellInfo(android.hardware.radio.V1_4.CellInfo ci) {
this.mRegistered = ci.isRegistered;
this.mTimeStamp = SystemClock.elapsedRealtimeNanos();
this.mCellConnectionStatus = ci.connectionStatus;
}
/** @hide */
public static CellInfo create(android.hardware.radio.V1_0.CellInfo ci) {
if (ci == null) return null;
@@ -342,4 +351,17 @@ public abstract class CellInfo implements Parcelable {
default: return null;
}
}
/** @hide */
public static CellInfo create(android.hardware.radio.V1_4.CellInfo ci) {
if (ci == null) return null;
switch (ci.info.getDiscriminator()) {
case Info.hidl_discriminator.gsm: return new CellInfoGsm(ci);
case Info.hidl_discriminator.cdma: return new CellInfoCdma(ci);
case Info.hidl_discriminator.lte: return new CellInfoLte(ci);
case Info.hidl_discriminator.wcdma: return new CellInfoWcdma(ci);
case Info.hidl_discriminator.tdscdma: return new CellInfoTdscdma(ci);
default: return null;
}
}
}

9
telephony/java/android/telephony/CellInfoCdma.java
View File

@@ -67,6 +67,15 @@ public final class CellInfoCdma extends CellInfo implements Parcelable {
new CellSignalStrengthCdma(cic.signalStrengthCdma, cic.signalStrengthEvdo);
}
/** @hide */
public CellInfoCdma(android.hardware.radio.V1_4.CellInfo ci) {
super(ci);
final android.hardware.radio.V1_2.CellInfoCdma cic = ci.info.cdma();
mCellIdentityCdma = new CellIdentityCdma(cic.cellIdentityCdma);
mCellSignalStrengthCdma =
new CellSignalStrengthCdma(cic.signalStrengthCdma, cic.signalStrengthEvdo);
}
@Override
public CellIdentityCdma getCellIdentity() {
return mCellIdentityCdma;

8
telephony/java/android/telephony/CellInfoGsm.java
View File

@@ -63,6 +63,14 @@ public final class CellInfoGsm extends CellInfo implements Parcelable {
mCellSignalStrengthGsm = new CellSignalStrengthGsm(cig.signalStrengthGsm);
}
/** @hide */
public CellInfoGsm(android.hardware.radio.V1_4.CellInfo ci) {
super(ci);
final android.hardware.radio.V1_2.CellInfoGsm cig = ci.info.gsm();
mCellIdentityGsm = new CellIdentityGsm(cig.cellIdentityGsm);
mCellSignalStrengthGsm = new CellSignalStrengthGsm(cig.signalStrengthGsm);
}
@Override
public CellIdentityGsm getCellIdentity() {
return mCellIdentityGsm;

9
telephony/java/android/telephony/CellInfoLte.java
View File

@@ -70,6 +70,15 @@ public final class CellInfoLte extends CellInfo implements Parcelable {
mCellConfig = new CellConfigLte();
}
/** @hide */
public CellInfoLte(android.hardware.radio.V1_4.CellInfo ci) {
super(ci);
final android.hardware.radio.V1_4.CellInfoLte cil = ci.info.lte();
mCellIdentityLte = new CellIdentityLte(cil.base.cellIdentityLte);
mCellSignalStrengthLte = new CellSignalStrengthLte(cil.base.signalStrengthLte);
mCellConfig = new CellConfigLte(cil.cellConfig);
}
@Override
public CellIdentityLte getCellIdentity() {
if (DBG) log("getCellIdentity: " + mCellIdentityLte);

8
telephony/java/android/telephony/CellInfoTdscdma.java
View File

@@ -64,6 +64,14 @@ public final class CellInfoTdscdma extends CellInfo implements Parcelable {
mCellSignalStrengthTdscdma = new CellSignalStrengthTdscdma(cit.signalStrengthTdscdma);
}
/** @hide */
public CellInfoTdscdma(android.hardware.radio.V1_4.CellInfo ci) {
super(ci);
final android.hardware.radio.V1_2.CellInfoTdscdma cit = ci.info.tdscdma();
mCellIdentityTdscdma = new CellIdentityTdscdma(cit.cellIdentityTdscdma);
mCellSignalStrengthTdscdma = new CellSignalStrengthTdscdma(cit.signalStrengthTdscdma);
}
@Override public CellIdentityTdscdma getCellIdentity() {
return mCellIdentityTdscdma;
}

8
telephony/java/android/telephony/CellInfoWcdma.java
View File

@@ -63,6 +63,14 @@ public final class CellInfoWcdma extends CellInfo implements Parcelable {
mCellSignalStrengthWcdma = new CellSignalStrengthWcdma(ciw.signalStrengthWcdma);
}
/** @hide */
public CellInfoWcdma(android.hardware.radio.V1_4.CellInfo ci) {
super(ci);
final android.hardware.radio.V1_2.CellInfoWcdma ciw = ci.info.wcdma();
mCellIdentityWcdma = new CellIdentityWcdma(ciw.cellIdentityWcdma);
mCellSignalStrengthWcdma = new CellSignalStrengthWcdma(ciw.signalStrengthWcdma);
}
@Override
public CellIdentityWcdma getCellIdentity() {
return mCellIdentityWcdma;