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

Merge "Add TimeStamp Constructor for HAL 1.4 Support"

Browse Source 
am: f899e26857

Change-Id: I9f96a8846bfb137bdcae8d8495188229637fac2c
This commit is contained in:
Nathan Harold
2019-03-08 11:39:33 -08:00
committed by android-build-merger
parent 26891a4429 f899e26857
commit 8dada71897
6 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,6 @@ import android.annotation.UnsupportedAppUsage;
import android.hardware.radio.V1_4.CellInfo.Info; import android.hardware.radio.V1_4.CellInfo.Info;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.os.SystemClock;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
@@ -325,9 +324,9 @@ public abstract class CellInfo implements Parcelable {
} }
/** @hide */ /** @hide */
protected CellInfo(android.hardware.radio.V1_4.CellInfo ci) { protected CellInfo(android.hardware.radio.V1_4.CellInfo ci, long timeStamp) {
this.mRegistered = ci.isRegistered; this.mRegistered = ci.isRegistered;
this.mTimeStamp = SystemClock.elapsedRealtimeNanos(); this.mTimeStamp = timeStamp;
this.mCellConnectionStatus = ci.connectionStatus; this.mCellConnectionStatus = ci.connectionStatus;
} }
@@ -358,14 +357,14 @@ public abstract class CellInfo implements Parcelable {
} }
/** @hide */ /** @hide */
public static CellInfo create(android.hardware.radio.V1_4.CellInfo ci) { public static CellInfo create(android.hardware.radio.V1_4.CellInfo ci, long timeStamp) {
if (ci == null) return null; if (ci == null) return null;
switch (ci.info.getDiscriminator()) { switch (ci.info.getDiscriminator()) {
case Info.hidl_discriminator.gsm: return new CellInfoGsm(ci); case Info.hidl_discriminator.gsm: return new CellInfoGsm(ci, timeStamp);
case Info.hidl_discriminator.cdma: return new CellInfoCdma(ci); case Info.hidl_discriminator.cdma: return new CellInfoCdma(ci, timeStamp);
case Info.hidl_discriminator.lte: return new CellInfoLte(ci); case Info.hidl_discriminator.lte: return new CellInfoLte(ci, timeStamp);
case Info.hidl_discriminator.wcdma: return new CellInfoWcdma(ci); case Info.hidl_discriminator.wcdma: return new CellInfoWcdma(ci, timeStamp);
case Info.hidl_discriminator.tdscdma: return new CellInfoTdscdma(ci); case Info.hidl_discriminator.tdscdma: return new CellInfoTdscdma(ci, timeStamp);
default: return null; default: return null;
} }
} }

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

@@ -68,8 +68,8 @@ public final class CellInfoCdma extends CellInfo implements Parcelable {
} }
/** @hide */ /** @hide */
public CellInfoCdma(android.hardware.radio.V1_4.CellInfo ci) { public CellInfoCdma(android.hardware.radio.V1_4.CellInfo ci, long timeStamp) {
super(ci); super(ci, timeStamp);
final android.hardware.radio.V1_2.CellInfoCdma cic = ci.info.cdma(); final android.hardware.radio.V1_2.CellInfoCdma cic = ci.info.cdma();
mCellIdentityCdma = new CellIdentityCdma(cic.cellIdentityCdma); mCellIdentityCdma = new CellIdentityCdma(cic.cellIdentityCdma);
mCellSignalStrengthCdma = mCellSignalStrengthCdma =

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

@@ -64,8 +64,8 @@ public final class CellInfoGsm extends CellInfo implements Parcelable {
} }
/** @hide */ /** @hide */
public CellInfoGsm(android.hardware.radio.V1_4.CellInfo ci) { public CellInfoGsm(android.hardware.radio.V1_4.CellInfo ci, long timeStamp) {
super(ci); super(ci, timeStamp);
final android.hardware.radio.V1_2.CellInfoGsm cig = ci.info.gsm(); final android.hardware.radio.V1_2.CellInfoGsm cig = ci.info.gsm();
mCellIdentityGsm = new CellIdentityGsm(cig.cellIdentityGsm); mCellIdentityGsm = new CellIdentityGsm(cig.cellIdentityGsm);
mCellSignalStrengthGsm = new CellSignalStrengthGsm(cig.signalStrengthGsm); mCellSignalStrengthGsm = new CellSignalStrengthGsm(cig.signalStrengthGsm);

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

@@ -71,8 +71,8 @@ public final class CellInfoLte extends CellInfo implements Parcelable {
} }
/** @hide */ /** @hide */
public CellInfoLte(android.hardware.radio.V1_4.CellInfo ci) { public CellInfoLte(android.hardware.radio.V1_4.CellInfo ci, long timeStamp) {
super(ci); super(ci, timeStamp);
final android.hardware.radio.V1_4.CellInfoLte cil = ci.info.lte(); final android.hardware.radio.V1_4.CellInfoLte cil = ci.info.lte();
mCellIdentityLte = new CellIdentityLte(cil.base.cellIdentityLte); mCellIdentityLte = new CellIdentityLte(cil.base.cellIdentityLte);
mCellSignalStrengthLte = new CellSignalStrengthLte(cil.base.signalStrengthLte); mCellSignalStrengthLte = new CellSignalStrengthLte(cil.base.signalStrengthLte);

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

@@ -65,8 +65,8 @@ public final class CellInfoTdscdma extends CellInfo implements Parcelable {
} }
/** @hide */ /** @hide */
public CellInfoTdscdma(android.hardware.radio.V1_4.CellInfo ci) { public CellInfoTdscdma(android.hardware.radio.V1_4.CellInfo ci, long timeStamp) {
super(ci); super(ci, timeStamp);
final android.hardware.radio.V1_2.CellInfoTdscdma cit = ci.info.tdscdma(); final android.hardware.radio.V1_2.CellInfoTdscdma cit = ci.info.tdscdma();
mCellIdentityTdscdma = new CellIdentityTdscdma(cit.cellIdentityTdscdma); mCellIdentityTdscdma = new CellIdentityTdscdma(cit.cellIdentityTdscdma);
mCellSignalStrengthTdscdma = new CellSignalStrengthTdscdma(cit.signalStrengthTdscdma); mCellSignalStrengthTdscdma = new CellSignalStrengthTdscdma(cit.signalStrengthTdscdma);

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

@@ -64,8 +64,8 @@ public final class CellInfoWcdma extends CellInfo implements Parcelable {
} }
/** @hide */ /** @hide */
public CellInfoWcdma(android.hardware.radio.V1_4.CellInfo ci) { public CellInfoWcdma(android.hardware.radio.V1_4.CellInfo ci, long timeStamp) {
super(ci); super(ci, timeStamp);
final android.hardware.radio.V1_2.CellInfoWcdma ciw = ci.info.wcdma(); final android.hardware.radio.V1_2.CellInfoWcdma ciw = ci.info.wcdma();
mCellIdentityWcdma = new CellIdentityWcdma(ciw.cellIdentityWcdma); mCellIdentityWcdma = new CellIdentityWcdma(ciw.cellIdentityWcdma);
mCellSignalStrengthWcdma = new CellSignalStrengthWcdma(ciw.signalStrengthWcdma); mCellSignalStrengthWcdma = new CellSignalStrengthWcdma(ciw.signalStrengthWcdma);