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

Commit 6e6ad596 authored by Joonhun Shin's avatar Joonhun Shin Committed by Android (Google) Code Review
Browse files

Merge "Update API description for setDeviceAlignedWithSatellite()" into main

parents 941b4189 141ba6b1

telephony/java/android/telephony/satellite/SatelliteManager.java

+6 −5
Original line number Diff line number Diff line
@@ -1965,13 +1965,14 @@ public final class SatelliteManager { 
    }



    /**

     * Inform whether the device is aligned with the satellite for demo mode.

     * Inform whether the device is aligned with the satellite in both real and demo mode.

     *

     * Framework can send datagram to modem only when device is aligned with the satellite.

     * This method helps framework to simulate the experience of sending datagram over satellite.

     * In demo mode, framework will send datagram to modem only when device is aligned with

     * the satellite. This method helps framework to simulate the experience of sending datagram

     * over satellite.

     *

     * @param isAligned {@true} Device is aligned with the satellite for demo mode

     *                  {@false} Device is not aligned with the satellite for demo mode

     * @param isAligned {code @true} Device is aligned with the satellite

     *                  {code @false} Device is not aligned with the satellite

     *

     * @throws SecurityException if the caller doesn't have required permission.

     * @throws IllegalStateException if the Telephony process is not currently available.

telephony/java/com/android/internal/telephony/ITelephony.aidl

+3 −3
Original line number Diff line number Diff line
@@ -2977,10 +2977,10 @@ interface ITelephony { 
    void requestTimeForNextSatelliteVisibility(in ResultReceiver receiver);



    /**

     * Inform whether the device is aligned with the satellite within in margin for demo mode.

     * Inform whether the device is aligned with the satellite in both real and demo mode.

     *

     * @param isAligned {@true} Device is aligned with the satellite for demo mode

     *                  {@false} Device is not aligned with the satellite for demo mode

     * @param isAligned {@true} Device is aligned with the satellite.

     *                  {@false} Device is not aligned with the satellite.

     */

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission("

            + "android.Manifest.permission.SATELLITE_COMMUNICATION)")