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

Merge "Update documentation according API review" am: 2f85c69c74 am: 2cb338dbc0

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619810

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a0aa4be487da19ef08f07f2613a15addacd2cdd
This commit is contained in:
Sooraj Sasindran
2021-03-11 02:18:50 +00:00
committed by Automerger Merge Worker
parent 4c0987e7e0 2cb338dbc0
commit b679d8bbcd
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -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 @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 setMobileDataPolicyEnabledStatus(int, boolean);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setMultiSimCarrierRestriction(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 @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 @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setPreferredNetworkTypeBitmask(long);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setRadio(boolean); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setRadio(boolean);

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

@@ -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. * the estimated first hop transport bandwidth.
* This will be {@link #INVALID} if the network is not connected * 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. * to the estimated first hop transport bandwidth.
* This will be {@link #INVALID} if the network is not connected * 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. * to the estimated first hop transport bandwidth.
* <p/> * <p/>
* This will be {@link #INVALID} if either are the case: * 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. * refers to the estimated first hop transport bandwidth.
* <p/> * <p/>
* This will be {@link #INVALID} if either are the case: * This will be {@link #INVALID} if either are the case:

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

@@ -14120,12 +14120,11 @@ public class TelephonyManager {
* {@link #NR_DUAL_CONNECTIVITY_DISABLE_IMMEDIATE} * {@link #NR_DUAL_CONNECTIVITY_DISABLE_IMMEDIATE}
* </ol> * </ol>
* @return operation result. * @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. * @throws IllegalStateException if the Telephony process is not currently available.
* @hide * @hide
*/ */
@SystemApi @SystemApi
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
public @EnableNrDualConnectivityResult int setNrDualConnectivityState( public @EnableNrDualConnectivityResult int setNrDualConnectivityState(
@NrDualConnectivityState int nrDualConnectivityState) { @NrDualConnectivityState int nrDualConnectivityState) {
try { try {