diff options
| -rw-r--r-- | core/api/current.txt | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 05e2a9aa7286..9c7796ef9d4b 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -43491,7 +43491,7 @@ package android.telephony { 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(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 String sendEnvelopeWithStatus(String); method @RequiresPermission(android.Manifest.permission.CALL_PHONE) public void sendUssdRequest(String, android.telephony.TelephonyManager.UssdResponseCallback, android.os.Handler); diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index fd738d2b531c..70d82701da66 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -8995,7 +8995,8 @@ public class TelephonyManager { * <p>Requires Permission: * {@link android.Manifest.permission#MODIFY_PHONE_STATE MODIFY_PHONE_STATE} or that the calling * 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 * following constraints: @@ -9009,7 +9010,10 @@ public class TelephonyManager { * </ol> * * @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 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 @@ -9020,8 +9024,7 @@ public class TelephonyManager { */ @SuppressAutoDoc // Blocked by b/72967236 - no support for carrier privileges @RequiresPermission(allOf = { - android.Manifest.permission.MODIFY_PHONE_STATE, - Manifest.permission.ACCESS_FINE_LOCATION + android.Manifest.permission.MODIFY_PHONE_STATE }) public @Nullable NetworkScan requestNetworkScan( @IncludeLocationData int includeLocationData, |