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

Commit 565c5325 authored by Hakjun Choi's avatar Hakjun Choi Committed by Android (Google) Code Review
Browse files

Merge "Remove unnecessary term 'all' from the API name" into main

parents 68bcd64b 49cb237f

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -17214,8 +17214,8 @@ package android.telephony.satellite { 
  @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public final class SatelliteManager {

    method @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void addAttachRestrictionForCarrier(int, int, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);

    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void deprovisionService(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);

    method @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") @NonNull @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public java.util.List<java.lang.String> getAllSatellitePlmnsForCarrier(int);

    method @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") @NonNull @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public java.util.Set<java.lang.Integer> getAttachRestrictionReasonsForCarrier(int);

    method @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") @NonNull @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public java.util.List<java.lang.String> getSatellitePlmnsForCarrier(int);

    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void pollPendingDatagrams(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);

    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void provisionService(@NonNull String, @NonNull byte[], @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);

    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public int registerForCapabilitiesChanged(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.satellite.SatelliteCapabilitiesCallback);

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

+3 −3
Original line number Diff line number Diff line
@@ -2168,7 +2168,7 @@ public final class SatelliteManager { 
     */

    @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)

    @FlaggedApi(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG)

    @NonNull public List<String> getAllSatellitePlmnsForCarrier(int subId) {

    @NonNull public List<String> getSatellitePlmnsForCarrier(int subId) {

        if (!SubscriptionManager.isValidSubscriptionId(subId)) {

            throw new IllegalArgumentException("Invalid subscription ID");

        }
@@ -2176,12 +2176,12 @@ public final class SatelliteManager { 
        try {

            ITelephony telephony = getITelephony();

            if (telephony != null) {

                return telephony.getAllSatellitePlmnsForCarrier(subId);

                return telephony.getSatellitePlmnsForCarrier(subId);

            } else {

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

            }

        } catch (RemoteException ex) {

            loge("getAllSatellitePlmnsForCarrier() RemoteException: " + ex);

            loge("getSatellitePlmnsForCarrier() RemoteException: " + ex);

            ex.rethrowAsRuntimeException();

        }

        return new ArrayList<>();

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

+1 −1
Original line number Diff line number Diff line
@@ -3274,5 +3274,5 @@ interface ITelephony { 
     */

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

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

    List<String> getAllSatellitePlmnsForCarrier(int subId);

    List<String> getSatellitePlmnsForCarrier(int subId);

}