diff options
| author | 2022-10-13 19:46:56 +0000 | |
|---|---|---|
| committer | 2022-10-13 19:46:56 +0000 | |
| commit | 37f46d5b02b5891e3147fd6ed00ae52ff378b6c3 (patch) | |
| tree | 64bafde39b6e56a2a02f949823f8b261e7fb4f91 /telephony | |
| parent | 4f5403741ddfd6a39641d2f2a969ea72f817e978 (diff) | |
| parent | 8314a3e51bd31e9c11a9b61e4bef88b2ad65803d (diff) | |
Merge "Improve the javadoc for the requestNetworkScan" am: 8314a3e51b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2215561
Change-Id: I6a7ebf1a32dbf357c0f11f0ff563b780f4bf0dec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 11 |
1 files changed, 7 insertions, 4 deletions
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, |