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

Commit 2f85c69c authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Gerrit Code Review
Browse files

Merge "Update documentation according API review"

parents 20414370 60310d71

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -10179,7 +10179,7 @@ package android.telephony { 
    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.telephony.PinResult setIccLockEnabled(boolean, @NonNull String);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMobileDataPolicyEnabledStatus(int, boolean);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMultiSimCarrierRestriction(boolean);

    method public int setNrDualConnectivityState(int);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setNrDualConnectivityState(int);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setOpportunisticNetworkState(boolean);

    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setPreferredNetworkTypeBitmask(long);

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setRadio(boolean);

telephony/java/android/telephony/CarrierBandwidth.java

+4 −4
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ public final class CarrierBandwidth implements Parcelable { 
    }



    /**

     * Retrieves the upstream bandwidth for the primary network in Kbps.  This always only refers to

     * Retrieves the upstream bandwidth for the primary network in kbps.  This always only refers to

     * the estimated first hop transport bandwidth.

     * This will be {@link #INVALID} if the network is not connected

     *
@@ -112,7 +112,7 @@ public final class CarrierBandwidth implements Parcelable { 
    }



    /**

     * Retrieves the downstream bandwidth for the primary network in Kbps.  This always only refers

     * Retrieves the downstream bandwidth for the primary network in kbps.  This always only refers

     * to the estimated first hop transport bandwidth.

     * This will be {@link #INVALID} if the network is not connected

     *
@@ -123,7 +123,7 @@ public final class CarrierBandwidth implements Parcelable { 
    }



    /**

     * Retrieves the upstream bandwidth for the secondary network in Kbps.  This always only refers

     * Retrieves the upstream bandwidth for the secondary network in kbps.  This always only refers

     * to the estimated first hop transport bandwidth.

     * <p/>

     * This will be {@link #INVALID} if either are the case:
@@ -143,7 +143,7 @@ public final class CarrierBandwidth implements Parcelable { 
    }



    /**

     * Retrieves the downstream bandwidth for the secondary network in Kbps.  This always only

     * Retrieves the downstream bandwidth for the secondary network in kbps.  This always only

     * refers to the estimated first hop transport bandwidth.

     * <p/>

     * This will be {@link #INVALID} if either are the case:

telephony/java/android/telephony/TelephonyManager.java

+1 −2
Original line number Diff line number Diff line
@@ -14120,12 +14120,11 @@ public class TelephonyManager { 
     * {@link #NR_DUAL_CONNECTIVITY_DISABLE_IMMEDIATE}

     * </ol>

     * @return operation result.

     * <p>Requires Permission:

     * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE}

     * @throws IllegalStateException if the Telephony process is not currently available.

     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)

    public @EnableNrDualConnectivityResult int setNrDualConnectivityState(

            @NrDualConnectivityState int nrDualConnectivityState) {

        try {