Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0be1445 authored by Nathan Harold's avatar Nathan Harold Committed by android-build-merger
Browse files

Merge "Merge "Access Identity and SignalStrength from CellInfo" am: c99ced9d... 

Merge "Merge "Access Identity and SignalStrength from CellInfo" am: c99ced9d am: 232487ff am: dabe94f3" into pi-dev-plus-aosp
am: 983d3ed2

Change-Id: Ifb97a479572d12717dabd2c1003342246dc80f00
parents eea8075d 983d3ed2

telephony/java/android/telephony/CellInfo.java

+9 −0
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.telephony;

package android.telephony;





import android.annotation.IntDef;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.os.Parcel;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.Parcelable;
@@ -124,6 +125,14 @@ public abstract class CellInfo implements Parcelable { 
        mTimeStamp = timeStamp;

        mTimeStamp = timeStamp;

    }

    }





    /** @hide */

    @NonNull

    public abstract CellIdentity getCellIdentity();



    /** @hide */

    @NonNull

    public abstract CellSignalStrength getCellSignalStrength();



    /**

    /**

     * Gets the connection status of this cell.

     * Gets the connection status of this cell.

     *

     *

telephony/java/android/telephony/CellInfoCdma.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -45,6 +45,7 @@ public final class CellInfoCdma extends CellInfo implements Parcelable { 
        this.mCellSignalStrengthCdma = ci.mCellSignalStrengthCdma.copy();

        this.mCellSignalStrengthCdma = ci.mCellSignalStrengthCdma.copy();

    }

    }





    @Override

    public CellIdentityCdma getCellIdentity() {

    public CellIdentityCdma getCellIdentity() {

        return mCellIdentityCdma;

        return mCellIdentityCdma;

    }

    }
@@ -53,6 +54,7 @@ public final class CellInfoCdma extends CellInfo implements Parcelable { 
        mCellIdentityCdma = cid;

        mCellIdentityCdma = cid;

    }

    }





    @Override

    public CellSignalStrengthCdma getCellSignalStrength() {

    public CellSignalStrengthCdma getCellSignalStrength() {

        return mCellSignalStrengthCdma;

        return mCellSignalStrengthCdma;

    }

    }

telephony/java/android/telephony/CellInfoGsm.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -45,6 +45,7 @@ public final class CellInfoGsm extends CellInfo implements Parcelable { 
        this.mCellSignalStrengthGsm = ci.mCellSignalStrengthGsm.copy();

        this.mCellSignalStrengthGsm = ci.mCellSignalStrengthGsm.copy();

    }

    }





    @Override

    public CellIdentityGsm getCellIdentity() {

    public CellIdentityGsm getCellIdentity() {

        return mCellIdentityGsm;

        return mCellIdentityGsm;

    }

    }
@@ -53,6 +54,7 @@ public final class CellInfoGsm extends CellInfo implements Parcelable { 
        mCellIdentityGsm = cid;

        mCellIdentityGsm = cid;

    }

    }





    @Override

    public CellSignalStrengthGsm getCellSignalStrength() {

    public CellSignalStrengthGsm getCellSignalStrength() {

        return mCellSignalStrengthGsm;

        return mCellSignalStrengthGsm;

    }

    }

telephony/java/android/telephony/CellInfoLte.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -45,6 +45,7 @@ public final class CellInfoLte extends CellInfo implements Parcelable { 
        this.mCellSignalStrengthLte = ci.mCellSignalStrengthLte.copy();

        this.mCellSignalStrengthLte = ci.mCellSignalStrengthLte.copy();

    }

    }





    @Override

    public CellIdentityLte getCellIdentity() {

    public CellIdentityLte getCellIdentity() {

        if (DBG) log("getCellIdentity: " + mCellIdentityLte);

        if (DBG) log("getCellIdentity: " + mCellIdentityLte);

        return mCellIdentityLte;

        return mCellIdentityLte;
@@ -55,6 +56,7 @@ public final class CellInfoLte extends CellInfo implements Parcelable { 
        mCellIdentityLte = cid;

        mCellIdentityLte = cid;

    }

    }





    @Override

    public CellSignalStrengthLte getCellSignalStrength() {

    public CellSignalStrengthLte getCellSignalStrength() {

        if (DBG) log("getCellSignalStrength: " + mCellSignalStrengthLte);

        if (DBG) log("getCellSignalStrength: " + mCellSignalStrengthLte);

        return mCellSignalStrengthLte;

        return mCellSignalStrengthLte;

telephony/java/android/telephony/CellInfoTdscdma.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -48,6 +48,7 @@ public final class CellInfoTdscdma extends CellInfo implements Parcelable { 
        this.mCellSignalStrengthTdscdma = ci.mCellSignalStrengthTdscdma.copy();

        this.mCellSignalStrengthTdscdma = ci.mCellSignalStrengthTdscdma.copy();

    }

    }





    @Override

    public CellIdentityTdscdma getCellIdentity() {

    public CellIdentityTdscdma getCellIdentity() {

        return mCellIdentityTdscdma;

        return mCellIdentityTdscdma;

    }

    }
@@ -56,6 +57,7 @@ public final class CellInfoTdscdma extends CellInfo implements Parcelable { 
        mCellIdentityTdscdma = cid;

        mCellIdentityTdscdma = cid;

    }

    }





    @Override

    public CellSignalStrengthTdscdma getCellSignalStrength() {

    public CellSignalStrengthTdscdma getCellSignalStrength() {

        return mCellSignalStrengthTdscdma;

        return mCellSignalStrengthTdscdma;

    }

    }