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

Commit d3595644 authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "update comments for resetRadioConfig and rebootRadio" 

am: 72378c7f

Change-Id: I4144d1978e2da9de3f123c0ac4c9d851ecad5089
parents 60239335 72378c7f

telephony/java/android/telephony/TelephonyManager.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -5347,7 +5347,7 @@ public class TelephonyManager { 




    /**

    /**

     * Rollback modem configurations to factory default except some config which are in whitelist.

     * Rollback modem configurations to factory default except some config which are in whitelist.

     * Used for device configuration by some CDMA operators.

     * Used for device configuration by some carriers.

     *

     *

     * <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
@@ -5374,7 +5374,7 @@ public class TelephonyManager { 
    }

    }





    /**

    /**

     * Generate a radio modem reset. Used for device configuration by some CDMA operators.

     * Generate a radio modem reset. Used for device configuration by some carriers.

     *

     *

     * <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