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

Commit 9cdc2183 authored by Aishwarya Mallampati's avatar Aishwarya Mallampati Committed by Android (Google) Code Review
Browse files

Merge "Renamed onDeviceAlignedWithSatellite to setDeviceAlignedWithSatellite" into main

parents 1ac1056a c86b3f74

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -17234,9 +17234,8 @@ package android.telephony.satellite { 
    method public void onSatelliteDatagramReceived(long, @NonNull android.telephony.satellite.SatelliteDatagram, int, @NonNull java.util.function.Consumer<java.lang.Void>);

  }













  public class SatelliteManager {













  public final class SatelliteManager {















    method @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void deprovisionSatelliteService(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);













    method @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void onDeviceAlignedWithSatellite(boolean);















    method @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void pollPendingSatelliteDatagrams(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);















    method @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void provisionSatelliteService(@NonNull String, @NonNull byte[], @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);















    method @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public int registerForSatelliteDatagram(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.satellite.SatelliteDatagramCallback);









@@ -17251,6 +17250,7 @@ package android.telephony.satellite {













    method @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void requestSatelliteEnabled(boolean, boolean, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);















    method @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void requestTimeForNextSatelliteVisibility(@NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.time.Duration,android.telephony.satellite.SatelliteManager.SatelliteException>);















    method @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void sendSatelliteDatagram(int, @NonNull android.telephony.satellite.SatelliteDatagram, boolean, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);













    method @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void setDeviceAlignedWithSatellite(boolean);















    method @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void startSatelliteTransmissionUpdates(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>, @NonNull android.telephony.satellite.SatelliteTransmissionUpdateCallback);















    method @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void stopSatelliteTransmissionUpdates(@NonNull android.telephony.satellite.SatelliteTransmissionUpdateCallback, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);















    method @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void unregisterForSatelliteDatagram(@NonNull android.telephony.satellite.SatelliteDatagramCallback);

























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



+3
−3




























Original line number
Diff line number
Diff line








@@ -57,7 +57,7 @@ import java.util.function.Consumer;













 */















@RequiresFeature(PackageManager.FEATURE_TELEPHONY_SATELLITE)















@SystemApi













public class SatelliteManager {













public final class SatelliteManager {















    private static final String TAG = "SatelliteManager";































    private static final ConcurrentHashMap<SatelliteDatagramCallback, ISatelliteDatagramCallback>










@@ -1545,11 +1545,11 @@ public class SatelliteManager {













     */















    @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)





























    public void onDeviceAlignedWithSatellite(boolean isAligned) {













    public void setDeviceAlignedWithSatellite(boolean isAligned) {















        try {















            ITelephony telephony = getITelephony();















            if (telephony != null) {













                telephony.onDeviceAlignedWithSatellite(mSubId, isAligned);













                telephony.setDeviceAlignedWithSatellite(mSubId, isAligned);















            } else {















                throw new IllegalStateException("telephony service is null.");















            }

































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



+1
−1




























Original line number
Diff line number
Diff line








@@ -2978,7 +2978,7 @@ interface ITelephony {













     */















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















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













    void onDeviceAlignedWithSatellite(int subId, in boolean isAligned);













    void setDeviceAlignedWithSatellite(int subId, in boolean isAligned);































    /**















     * This API can be used by only CTS to update satellite vendor service package name.