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

Commit 77d0a77d authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Automerger Merge Worker
Browse files

Merge "Improve the javadoc for the requestNetworkScan" am: 8314a3e5 am: 37f46d5b am: 6de00d85 

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



Change-Id: Ic5222b6ec3b2cab9771a7104b59f158590c4e6f3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f724f5c0 6de00d85

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -43818,7 +43818,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);

telephony/java/android/telephony/TelephonyManager.java

+7 −4
Original line number Diff line number Diff line
@@ -9113,7 +9113,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:
@@ -9127,7 +9128,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
@@ -9138,8 +9142,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,