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

Commit 847c88c7 authored by Hakjun Choi's avatar Hakjun Choi
Browse files

new public API and AIDL to get and listen for signal strength changes. 

Below public APIs are added
  requestNtnSignalStrength()
  registerForNtnSignalStrengthChanged()
  unregisterForNtnSignalStrengthChanged()

Bug: 301511156
Test: SatelliteManagerTest, SatelliteControllerTest,
SatelliteManagerTestOnMockService

Change-Id: I08490bb8b7bc5bcd27eacc153750b957741670ac
parent 7631cf0c

core/api/system-current.txt

+20 −0
Original line number Diff line number Diff line
@@ -16741,6 +16741,23 @@ package android.telephony.satellite { 
    field @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @NonNull public static final android.os.Parcelable.Creator<android.telephony.satellite.AntennaPosition> CREATOR;

  }













  @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public final class NtnSignalStrength implements android.os.Parcelable {













    ctor @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public NtnSignalStrength(@Nullable android.telephony.satellite.NtnSignalStrength);













    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public int describeContents();













    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public int getLevel();













    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public void writeToParcel(@NonNull android.os.Parcel, int);













    field @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @NonNull public static final android.os.Parcelable.Creator<android.telephony.satellite.NtnSignalStrength> CREATOR;













    field @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public static final int NTN_SIGNAL_STRENGTH_GOOD = 3; // 0x3













    field @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public static final int NTN_SIGNAL_STRENGTH_GREAT = 4; // 0x4













    field @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public static final int NTN_SIGNAL_STRENGTH_MODERATE = 2; // 0x2













    field @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public static final int NTN_SIGNAL_STRENGTH_NONE = 0; // 0x0













    field @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public static final int NTN_SIGNAL_STRENGTH_POOR = 1; // 0x1













  }

























  @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public interface NtnSignalStrengthCallback {













    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public void onNtnSignalStrengthChanged(@NonNull android.telephony.satellite.NtnSignalStrength);













  }



























  @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public final class PointingInfo implements android.os.Parcelable {















    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public int describeContents();















    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public float getSatelliteAzimuthDegrees();










@@ -16776,6 +16793,7 @@ package android.telephony.satellite {













    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> getSatelliteAttachRestrictionReasonsForCarrier(int);















    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void pollPendingSatelliteDatagrams(@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 provisionSatelliteService(@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 registerForNtnSignalStrengthChanged(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.satellite.NtnSignalStrengthCallback);















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















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















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









@@ -16786,6 +16804,7 @@ package android.telephony.satellite {













    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void requestIsSatelliteEnabled(@NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Boolean,android.telephony.satellite.SatelliteManager.SatelliteException>);















    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void requestIsSatelliteProvisioned(@NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Boolean,android.telephony.satellite.SatelliteManager.SatelliteException>);















    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public void requestIsSatelliteSupported(@NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Boolean,android.telephony.satellite.SatelliteManager.SatelliteException>);













    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @NonNull @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void requestNtnSignalStrength(@NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.telephony.satellite.NtnSignalStrength,android.telephony.satellite.SatelliteManager.SatelliteException>);















    method @FlaggedApi("com.android.internal.telephony.flags.carrier_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void requestSatelliteAttachEnabledForCarrier(int, boolean, @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 requestSatelliteCapabilities(@NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<android.telephony.satellite.SatelliteCapabilities,android.telephony.satellite.SatelliteManager.SatelliteException>);















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









@@ -16794,6 +16813,7 @@ package android.telephony.satellite {













    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void setDeviceAlignedWithSatellite(boolean);















    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @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 @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @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 @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void unregisterForNtnSignalStrengthChanged(@NonNull android.telephony.satellite.NtnSignalStrengthCallback);















    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void unregisterForSatelliteDatagram(@NonNull android.telephony.satellite.SatelliteDatagramCallback);















    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void unregisterForSatelliteModemStateChanged(@NonNull android.telephony.satellite.SatelliteStateCallback);















    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void unregisterForSatelliteProvisionStateChanged(@NonNull android.telephony.satellite.SatelliteProvisionStateCallback);

























telephony/java/android/telephony/satellite/INtnSignalStrengthCallback.aidl
0 → 100644



+31
−0






























Original line number
Diff line number
Diff line













/*













 * Copyright 2023 The Android Open Source Project













 *













 * Licensed under the Apache License, Version 2.0 (the "License");













 * you may not use this file except in compliance with the License.













 * You may obtain a copy of the License at













 *













 *      http://www.apache.org/licenses/LICENSE-2.0













 *













 * Unless required by applicable law or agreed to in writing, software













 * distributed under the License is distributed on an "AS IS" BASIS,













 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













 * See the License for the specific language governing permissions and













 * limitations under the License.













 */



























package android.telephony.satellite;



























import android.telephony.satellite.NtnSignalStrength;



























/**













 * Interface for non-terrestrial signal strength notify callback.













 * @hide













 */













oneway interface INtnSignalStrengthCallback {













    /**













     * Called when NTN signal strength changes.













     * @param ntnSignalStrength The new NTN signal strength.













     */













    void onNtnSignalStrengthChanged(in NtnSignalStrength ntnSignalStrength);













}
























telephony/java/android/telephony/satellite/NtnSignalStrength.aidl
0 → 100644



+19
−0






























Original line number
Diff line number
Diff line













/*













 * Copyright 2023, The Android Open Source Project













 *













 * Licensed under the Apache License, Version 2.0 (the "License");













 * you may not use this file except in compliance with the License.













 * You may obtain a copy of the License at













 *













 *     http://www.apache.org/licenses/LICENSE-2.0













 *













 * Unless required by applicable law or agreed to in writing, software













 * distributed under the License is distributed on an "AS IS" BASIS,













 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













 * See the License for the specific language governing permissions and













 * limitations under the License.













 */



























package android.telephony.satellite;



























parcelable NtnSignalStrength;
























telephony/java/android/telephony/satellite/NtnSignalStrength.java
0 → 100644



+149
−0






























Original line number
Diff line number
Diff line













/*













 * Copyright (C) 2023 The Android Open Source Project













 *













 * Licensed under the Apache License, Version 2.0 (the "License");













 * you may not use this file except in compliance with the License.













 * You may obtain a copy of the License at













 *













 *      http://www.apache.org/licenses/LICENSE-2.0













 *













 * Unless required by applicable law or agreed to in writing, software













 * distributed under the License is distributed on an "AS IS" BASIS,













 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













 * See the License for the specific language governing permissions and













 * limitations under the License.













 */



























package android.telephony.satellite;



























import android.annotation.FlaggedApi;













import android.annotation.IntDef;













import android.annotation.Nullable;













import android.annotation.SystemApi;













import android.os.Parcel;













import android.os.Parcelable;



























import androidx.annotation.NonNull;



























import com.android.internal.telephony.flags.Flags;



























import java.lang.annotation.Retention;













import java.lang.annotation.RetentionPolicy;



























/**













 * NTN signal strength related information.













 * @hide













 */













@SystemApi













@FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)













public final class NtnSignalStrength implements Parcelable {













    /** Non-terrestrial network signal strength is not available. */













    @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)













    public static final int NTN_SIGNAL_STRENGTH_NONE = 0;













    /** Non-terrestrial network signal strength is poor. */













    @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)













    public static final int NTN_SIGNAL_STRENGTH_POOR = 1;













    /** Non-terrestrial network signal strength is moderate. */













    @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)













    public static final int NTN_SIGNAL_STRENGTH_MODERATE = 2;













    /** Non-terrestrial network signal strength is good. */













    @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)













    public static final int NTN_SIGNAL_STRENGTH_GOOD = 3;













    /** Non-terrestrial network signal strength is great. */













    @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)













    public static final int NTN_SIGNAL_STRENGTH_GREAT = 4;













    @NtnSignalStrengthLevel private int mLevel;



























    /** @hide */













    @IntDef(prefix = "NTN_SIGNAL_STRENGTH_", value = {













            NTN_SIGNAL_STRENGTH_NONE,













            NTN_SIGNAL_STRENGTH_POOR,













            NTN_SIGNAL_STRENGTH_MODERATE,













            NTN_SIGNAL_STRENGTH_GOOD,













            NTN_SIGNAL_STRENGTH_GREAT













    })













    @Retention(RetentionPolicy.SOURCE)













    public @interface NtnSignalStrengthLevel {}



























    /**













     * Create a parcelable object to inform the current non-terrestrial signal strength













     * @hide













     */













    @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)













    public NtnSignalStrength(@NtnSignalStrengthLevel int level) {













        this.mLevel = level;













    }



























    /**













     * This constructor is used to create a copy of an existing NtnSignalStrength object.













     */













    @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)













    public NtnSignalStrength(@Nullable NtnSignalStrength source) {













        this.mLevel = (source == null) ? NTN_SIGNAL_STRENGTH_NONE : source.getLevel();













    }



























    private NtnSignalStrength(Parcel in) {













        readFromParcel(in);













    }



























    @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)













    @NtnSignalStrengthLevel public int getLevel() {













        return mLevel;













    }



























    /**













     * @return 0













     */













    @Override













    @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)













    public int describeContents() {













        return 0;













    }



























    /**













     * @param out  The Parcel in which the object should be written.













     * @param flags Additional flags about how the object should be written.













     *              May be 0 or {@link #PARCELABLE_WRITE_RETURN_VALUE}.













     */













    @Override













    @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)













    public void writeToParcel(@NonNull Parcel out, int flags) {













        out.writeInt(mLevel);













    }



























    private void readFromParcel(Parcel in) {













        mLevel = in.readInt();













    }



























    @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)













    @NonNull public static final Creator<NtnSignalStrength> CREATOR =













            new Creator<NtnSignalStrength>() {













                @Override public NtnSignalStrength createFromParcel(Parcel in) {













                    return new NtnSignalStrength(in);













                }



























                @Override public NtnSignalStrength[] newArray(int size) {













                    return new NtnSignalStrength[size];













                }













            };



























    @Override













    public int hashCode() {













        return mLevel;













    }



























    @Override













    public boolean equals(Object obj) {













        if (this == obj) return true;













        if (obj == null || getClass() != obj.getClass()) return false;



























        NtnSignalStrength that = (NtnSignalStrength) obj;













        return mLevel == that.mLevel;













    }



























    @Override public String toString() {













        return "NtnSignalStrength{"













                + "mLevel=" + mLevel













                + '}';













    }













}
























telephony/java/android/telephony/satellite/NtnSignalStrengthCallback.java
0 → 100644



+39
−0






























Original line number
Diff line number
Diff line













/*













 * Copyright (C) 2023 The Android Open Source Project













 *













 * Licensed under the Apache License, Version 2.0 (the "License");













 * you may not use this file except in compliance with the License.













 * You may obtain a copy of the License at













 *













 *      http://www.apache.org/licenses/LICENSE-2.0













 *













 * Unless required by applicable law or agreed to in writing, software













 * distributed under the License is distributed on an "AS IS" BASIS,













 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.













 * See the License for the specific language governing permissions and













 * limitations under the License.













 */



























package android.telephony.satellite;



























import android.annotation.FlaggedApi;













import android.annotation.NonNull;













import android.annotation.SystemApi;



























import com.android.internal.telephony.flags.Flags;



























/**













 * A callback class for notifying satellite signal strength change.













 *













 * @hide













 */













@SystemApi













@FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)













public interface NtnSignalStrengthCallback {













    /**













     * Called when non-terrestrial network signal strength changes.













     * @param ntnSignalStrength The new non-terrestrial network signal strength.













     */













    @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)













    void onNtnSignalStrengthChanged(@NonNull NtnSignalStrength ntnSignalStrength);













}