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

Merge "Improve the javadoc for the requestNetworkScan" am: 8314a3e51b am: 37f46d5b02

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

Change-Id: Iff92513c7692e632b7ca099e95816e4a661ccd94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sooraj Sasindran
2022-10-13 20:02:17 +00:00
committed by Automerger Merge Worker
parent 11c14be766 37f46d5b02
commit 6de00d8540
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -43491,7 +43491,7 @@ package android.telephony {
method public void registerTelephonyCallback(int, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyCallback); method public void registerTelephonyCallback(int, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyCallback);
method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void requestCellInfoUpdate(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CellInfoCallback); method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void requestCellInfoUpdate(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CellInfoCallback);
method @RequiresPermission(allOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public android.telephony.NetworkScan requestNetworkScan(android.telephony.NetworkScanRequest, java.util.concurrent.Executor, android.telephony.TelephonyScanManager.NetworkScanCallback); method @RequiresPermission(allOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public android.telephony.NetworkScan requestNetworkScan(android.telephony.NetworkScanRequest, java.util.concurrent.Executor, android.telephony.TelephonyScanManager.NetworkScanCallback);
method @Nullable @RequiresPermission(allOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public android.telephony.NetworkScan requestNetworkScan(int, @NonNull android.telephony.NetworkScanRequest, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyScanManager.NetworkScanCallback); method @Nullable @RequiresPermission(allOf={android.Manifest.permission.MODIFY_PHONE_STATE}) public android.telephony.NetworkScan requestNetworkScan(int, @NonNull android.telephony.NetworkScanRequest, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyScanManager.NetworkScanCallback);
method public void sendDialerSpecialCode(String); method public void sendDialerSpecialCode(String);
method public String sendEnvelopeWithStatus(String); method public String sendEnvelopeWithStatus(String);
method @RequiresPermission(android.Manifest.permission.CALL_PHONE) public void sendUssdRequest(String, android.telephony.TelephonyManager.UssdResponseCallback, android.os.Handler); method @RequiresPermission(android.Manifest.permission.CALL_PHONE) public void sendUssdRequest(String, android.telephony.TelephonyManager.UssdResponseCallback, android.os.Handler);

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

@@ -8995,7 +8995,8 @@ public class TelephonyManager {
* <p>Requires Permission: * <p>Requires Permission:
* {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} or that the calling * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} or that the calling
* app has carrier privileges (see {@link #hasCarrierPrivileges}) * app has carrier privileges (see {@link #hasCarrierPrivileges})
* and {@link android.Manifest.permission#ACCESS_FINE_LOCATION}. * and {@link android.Manifest.permission#ACCESS_FINE_LOCATION} if includeLocationData is
* set to {@link #INCLUDE_LOCATION_DATA_FINE}.
* *
* If the system-wide location switch is off, apps may still call this API, with the * If the system-wide location switch is off, apps may still call this API, with the
* following constraints: * following constraints:
@@ -9009,7 +9010,10 @@ public class TelephonyManager {
* </ol> * </ol>
* *
* @param includeLocationData Specifies if the caller would like to receive * @param includeLocationData Specifies if the caller would like to receive
* location related information. * location related information. If this parameter is set to
* {@link #INCLUDE_LOCATION_DATA_FINE} then the application will be checked for
* {@link android.Manifest.permission#ACCESS_FINE_LOCATION} permission and available
* location related information received during network scan will be sent to the caller.
* @param request Contains all the RAT with bands/channels that need to be scanned. * @param request Contains all the RAT with bands/channels that need to be scanned.
* @param executor The executor through which the callback should be invoked. Since the scan * @param executor The executor through which the callback should be invoked. Since the scan
* request may trigger multiple callbacks and they must be invoked in the same order as * request may trigger multiple callbacks and they must be invoked in the same order as
@@ -9020,8 +9024,7 @@ public class TelephonyManager {
*/ */
@SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges @SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges
@RequiresPermission(allOf = { @RequiresPermission(allOf = {
android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.MODIFY_PHONE_STATE
Manifest.permission.ACCESS_FINE_LOCATION
}) })
public @Nullable NetworkScan requestNetworkScan( public @Nullable NetworkScan requestNetworkScan(
@IncludeLocationData int includeLocationData, @IncludeLocationData int includeLocationData,