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

Commit ccd3db74 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clean up aconfig flag oem_enabled_satellite_flag for SatelliteManager" into main

parents d79dea4a 7eeec194

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -18195,7 +18195,7 @@ package android.telephony.satellite { 
    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public void onSatelliteDatagramReceived(long, @NonNull android.telephony.satellite.SatelliteDatagram, int, @NonNull java.util.function.Consumer<java.lang.Void>);

  }













  @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public final class SatelliteManager {













  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.Set<java.lang.Integer> getAttachRestrictionReasonsForCarrier(int);

























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



+0
−1




























Original line number
Diff line number
Diff line








@@ -68,7 +68,6 @@ import java.util.stream.Collectors;













 */















@RequiresFeature(PackageManager.FEATURE_TELEPHONY_SATELLITE)















@SystemApi













@FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)















public final class SatelliteManager {















    private static final String TAG = "SatelliteManager";