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

Commit 7db3f8cf authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove unspportedAppUsage from satellite apis" into udc-dev am: 456fe77d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22548154



Change-Id: I2fb4b2a93a477d5fff69f407345d6abf396c9fa9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 21c47bf4 456fe77d

telephony/java/android/telephony/satellite/PointingInfo.java

+1 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package android.telephony.satellite;



import android.annotation.NonNull;

import android.compat.annotation.UnsupportedAppUsage;

import android.os.Parcel;

import android.os.Parcelable;
@@ -34,7 +33,7 @@ public final class PointingInfo implements Parcelable { 
    /**

     * @hide

     */

    @UnsupportedAppUsage



    public PointingInfo(float satelliteAzimuthDegrees, float satelliteElevationDegrees) {

        mSatelliteAzimuthDegrees = satelliteAzimuthDegrees;

        mSatelliteElevationDegrees = satelliteElevationDegrees;

telephony/java/android/telephony/satellite/SatelliteCapabilities.java

+0 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package android.telephony.satellite;



import android.annotation.NonNull;

import android.compat.annotation.UnsupportedAppUsage;

import android.os.Parcel;

import android.os.Parcelable;
@@ -57,7 +56,6 @@ public final class SatelliteCapabilities implements Parcelable { 
    /**

     * @hide

     */

    @UnsupportedAppUsage

    public SatelliteCapabilities(Set<Integer> supportedRadioTechnologies,

            boolean isPointingRequired, int maxBytesPerOutgoingDatagram,

            @NonNull Map<Integer, AntennaPosition> antennaPositionMap) {

telephony/java/android/telephony/satellite/SatelliteDatagram.java

+0 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package android.telephony.satellite;



import android.annotation.NonNull;

import android.compat.annotation.UnsupportedAppUsage;

import android.os.Parcel;

import android.os.Parcelable;
@@ -33,7 +32,6 @@ public final class SatelliteDatagram implements Parcelable { 
    /**

     * @hide

     */

    @UnsupportedAppUsage

    public SatelliteDatagram(@NonNull byte[] data) {

        mData = data;

    }

telephony/java/android/telephony/satellite/SatelliteDatagramCallback.java

+0 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package android.telephony.satellite;



import android.annotation.NonNull;

import android.compat.annotation.UnsupportedAppUsage;



import java.util.function.Consumer;
@@ -37,7 +36,6 @@ public interface SatelliteDatagramCallback { 
     *                 that they received the datagram. If the callback is not received within

     *                 five minutes, Telephony will resend the datagram.

     */

    @UnsupportedAppUsage

    void onSatelliteDatagramReceived(long datagramId, @NonNull SatelliteDatagram datagram,

            int pendingCount, @NonNull Consumer<Void> callback);

}

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

+29 −30
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.RequiresFeature;

import android.annotation.RequiresPermission;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.content.pm.PackageManager;

import android.os.Binder;
@@ -37,8 +36,8 @@ import android.telephony.SubscriptionManager; 
import android.telephony.TelephonyFrameworkInitializer;



import com.android.internal.telephony.IIntegerConsumer;

import com.android.internal.telephony.IVoidConsumer;

import com.android.internal.telephony.ITelephony;

import com.android.internal.telephony.IVoidConsumer;

import com.android.telephony.Rlog;



import java.lang.annotation.Retention;
@@ -83,7 +82,7 @@ public class SatelliteManager { 
     * @param context The context the SatelliteManager belongs to.

     * @hide

     */

    @UnsupportedAppUsage



    public SatelliteManager(@Nullable Context context) {

        this(context, SubscriptionManager.DEFAULT_SUBSCRIPTION_ID);

    }
@@ -129,7 +128,7 @@ public class SatelliteManager { 
     * {@link #requestIsSatelliteEnabled(Executor, OutcomeReceiver)}.

     * @hide

     */

    @UnsupportedAppUsage



    public static final String KEY_SATELLITE_ENABLED = "satellite_enabled";



    /**
@@ -137,7 +136,7 @@ public class SatelliteManager { 
     * {@link #requestIsDemoModeEnabled(Executor, OutcomeReceiver)}.

     * @hide

     */

    @UnsupportedAppUsage



    public static final String KEY_DEMO_MODE_ENABLED = "demo_mode_enabled";



    /**
@@ -145,7 +144,7 @@ public class SatelliteManager { 
     * {@link #requestIsSatelliteSupported(Executor, OutcomeReceiver)}.

     * @hide

     */

    @UnsupportedAppUsage



    public static final String KEY_SATELLITE_SUPPORTED = "satellite_supported";



    /**
@@ -153,7 +152,7 @@ public class SatelliteManager { 
     * {@link #requestSatelliteCapabilities(Executor, OutcomeReceiver)}.

     * @hide

     */

    @UnsupportedAppUsage



    public static final String KEY_SATELLITE_CAPABILITIES = "satellite_capabilities";



    /**
@@ -161,7 +160,7 @@ public class SatelliteManager { 
     * {@link #requestIsSatelliteProvisioned(Executor, OutcomeReceiver)}.

     * @hide

     */

    @UnsupportedAppUsage



    public static final String KEY_SATELLITE_PROVISIONED = "satellite_provisioned";



    /**
@@ -169,7 +168,7 @@ public class SatelliteManager { 
     * {@link #requestIsSatelliteCommunicationAllowedForCurrentLocation(Executor, OutcomeReceiver)}.

     * @hide

     */

    @UnsupportedAppUsage



    public static final String KEY_SATELLITE_COMMUNICATION_ALLOWED =

            "satellite_communication_allowed";
@@ -178,7 +177,7 @@ public class SatelliteManager { 
     * {@link #requestTimeForNextSatelliteVisibility(Executor, OutcomeReceiver)}.

     * @hide

     */

    @UnsupportedAppUsage



    public static final String KEY_SATELLITE_NEXT_VISIBILITY = "satellite_next_visibility";



    /**
@@ -389,7 +388,7 @@ public class SatelliteManager { 
     * @throws IllegalStateException if the Telephony process is not currently available.

     */

    @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)

    @UnsupportedAppUsage



    public void requestSatelliteEnabled(boolean enableSatellite, boolean enableDemoMode,

            @NonNull @CallbackExecutor Executor executor,

            @SatelliteError @NonNull Consumer<Integer> resultListener) {
@@ -432,7 +431,7 @@ public class SatelliteManager { 
     * @throws IllegalStateException if the Telephony process is not currently available.

     */

    @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)

    @UnsupportedAppUsage



    public void requestIsSatelliteEnabled(@NonNull @CallbackExecutor Executor executor,

            @NonNull OutcomeReceiver<Boolean, SatelliteException> callback) {

        Objects.requireNonNull(executor);
@@ -487,7 +486,7 @@ public class SatelliteManager { 
     * @throws IllegalStateException if the Telephony process is not currently available.

     */

    @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)

    @UnsupportedAppUsage



    public void requestIsDemoModeEnabled(@NonNull @CallbackExecutor Executor executor,

            @NonNull OutcomeReceiver<Boolean, SatelliteException> callback) {

        Objects.requireNonNull(executor);
@@ -540,7 +539,7 @@ public class SatelliteManager { 
     *

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

     */

    @UnsupportedAppUsage



    public void requestIsSatelliteSupported(@NonNull @CallbackExecutor Executor executor,

            @NonNull OutcomeReceiver<Boolean, SatelliteException> callback) {

        Objects.requireNonNull(executor);
@@ -594,7 +593,7 @@ public class SatelliteManager { 
     * @throws IllegalStateException if the Telephony process is not currently available.

     */

    @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)

    @UnsupportedAppUsage



    public void requestSatelliteCapabilities(@NonNull @CallbackExecutor Executor executor,

            @NonNull OutcomeReceiver<SatelliteCapabilities, SatelliteException> callback) {

        Objects.requireNonNull(executor);
@@ -787,7 +786,7 @@ public class SatelliteManager { 
     * @throws IllegalStateException if the Telephony process is not currently available.

     */

    @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)

    @UnsupportedAppUsage



    public void startSatelliteTransmissionUpdates(@NonNull @CallbackExecutor Executor executor,

            @SatelliteError @NonNull Consumer<Integer> resultListener,

            @NonNull SatelliteTransmissionUpdateCallback callback) {
@@ -857,7 +856,7 @@ public class SatelliteManager { 
     * @throws IllegalStateException if the Telephony process is not currently available.

     */

    @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)

    @UnsupportedAppUsage



    public void stopSatelliteTransmissionUpdates(

            @NonNull SatelliteTransmissionUpdateCallback callback,

            @NonNull @CallbackExecutor Executor executor,
@@ -913,7 +912,7 @@ public class SatelliteManager { 
     * @throws IllegalStateException if the Telephony process is not currently available.

     */

    @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)

    @UnsupportedAppUsage



    public void provisionSatelliteService(@NonNull String token, @NonNull byte[] provisionData,

            @Nullable CancellationSignal cancellationSignal,

            @NonNull @CallbackExecutor Executor executor,
@@ -963,7 +962,7 @@ public class SatelliteManager { 
     * @throws IllegalStateException if the Telephony process is not currently available.

     */

    @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)

    @UnsupportedAppUsage



    public void deprovisionSatelliteService(@NonNull String token,

            @NonNull @CallbackExecutor Executor executor,

            @SatelliteError @NonNull Consumer<Integer> resultListener) {
@@ -1003,7 +1002,7 @@ public class SatelliteManager { 
     * @throws IllegalStateException if the Telephony process is not currently available.

     */

    @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)

    @UnsupportedAppUsage



    @SatelliteError public int registerForSatelliteProvisionStateChanged(

            @NonNull @CallbackExecutor Executor executor,

            @NonNull SatelliteProvisionStateCallback callback) {
@@ -1046,7 +1045,7 @@ public class SatelliteManager { 
     * @throws IllegalStateException if the Telephony process is not currently available.

     */

    @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)

    @UnsupportedAppUsage



    public void unregisterForSatelliteProvisionStateChanged(

            @NonNull SatelliteProvisionStateCallback callback) {

        Objects.requireNonNull(callback);
@@ -1085,7 +1084,7 @@ public class SatelliteManager { 
     * @throws IllegalStateException if the Telephony process is not currently available.

     */

    @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)

    @UnsupportedAppUsage



    public void requestIsSatelliteProvisioned(@NonNull @CallbackExecutor Executor executor,

            @NonNull OutcomeReceiver<Boolean, SatelliteException> callback) {

        Objects.requireNonNull(executor);
@@ -1137,7 +1136,7 @@ public class SatelliteManager { 
     * @throws IllegalStateException if the Telephony process is not currently available.

     */

    @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)

    @UnsupportedAppUsage



    @SatelliteError public int registerForSatelliteModemStateChanged(

            @NonNull @CallbackExecutor Executor executor,

            @NonNull SatelliteStateCallback callback) {
@@ -1177,7 +1176,7 @@ public class SatelliteManager { 
     * @throws IllegalStateException if the Telephony process is not currently available.

     */

    @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)

    @UnsupportedAppUsage



    public void unregisterForSatelliteModemStateChanged(@NonNull SatelliteStateCallback callback) {

        Objects.requireNonNull(callback);

        ISatelliteStateCallback internalCallback = sSatelliteStateCallbackMap.remove(callback);
@@ -1212,7 +1211,7 @@ public class SatelliteManager { 
     * @throws IllegalStateException if the Telephony process is not currently available.

     */

    @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)

    @UnsupportedAppUsage



    @SatelliteError public int registerForSatelliteDatagram(

            @NonNull @CallbackExecutor Executor executor,

            @NonNull SatelliteDatagramCallback callback) {
@@ -1268,7 +1267,7 @@ public class SatelliteManager { 
     * @throws IllegalStateException if the Telephony process is not currently available.

     */

    @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)

    @UnsupportedAppUsage



    public void unregisterForSatelliteDatagram(@NonNull SatelliteDatagramCallback callback) {

        Objects.requireNonNull(callback);

        ISatelliteDatagramCallback internalCallback =
@@ -1306,7 +1305,7 @@ public class SatelliteManager { 
     * @throws IllegalStateException if the Telephony process is not currently available.

     */

    @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)

    @UnsupportedAppUsage



    public void pollPendingSatelliteDatagrams(@NonNull @CallbackExecutor Executor executor,

            @SatelliteError @NonNull Consumer<Integer> resultListener) {

        Objects.requireNonNull(executor);
@@ -1359,7 +1358,7 @@ public class SatelliteManager { 
     * @throws IllegalStateException if the Telephony process is not currently available.

     */

    @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)

    @UnsupportedAppUsage



    public void sendSatelliteDatagram(@DatagramType int datagramType,

            @NonNull SatelliteDatagram datagram, boolean needFullScreenPointingUI,

            @NonNull @CallbackExecutor Executor executor,
@@ -1405,7 +1404,7 @@ public class SatelliteManager { 
     * @throws IllegalStateException if the Telephony process is not currently available.

     */

    @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)

    @UnsupportedAppUsage



    public void requestIsSatelliteCommunicationAllowedForCurrentLocation(

            @NonNull @CallbackExecutor Executor executor,

            @NonNull OutcomeReceiver<Boolean, SatelliteException> callback) {
@@ -1463,7 +1462,7 @@ public class SatelliteManager { 
     * @throws IllegalStateException if the Telephony process is not currently available.

     */

    @RequiresPermission(Manifest.permission.SATELLITE_COMMUNICATION)

    @UnsupportedAppUsage



    public void requestTimeForNextSatelliteVisibility(@NonNull @CallbackExecutor Executor executor,

            @NonNull OutcomeReceiver<Duration, SatelliteException> callback) {

        Objects.requireNonNull(executor);