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

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

Merge "Address API review comments." into main

parents 3da813ee 4d665b6f

core/api/system-current.txt

+8 −8
Original line number Diff line number Diff line
@@ -15956,7 +15956,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public default void onCallStatesChanged(@NonNull java.util.List<android.telephony.CallState>);

  }













  @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") public static interface TelephonyCallback.CarrierRoamingNtnModeListener {













  @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") public static interface TelephonyCallback.CarrierRoamingNtnListener {















    method public default void onCarrierRoamingNtnAvailableServicesChanged(@NonNull int[]);















    method public default void onCarrierRoamingNtnEligibleStateChanged(boolean);















    method public void onCarrierRoamingNtnModeChanged(boolean);










@@ -18634,9 +18634,9 @@ package android.telephony.satellite {













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















  }



























  @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") public interface SatelliteCommunicationAllowedStateCallback {













    method public default void onSatelliteAccessConfigurationChanged(@Nullable android.telephony.satellite.SatelliteAccessConfiguration);













    method public void onSatelliteCommunicationAllowedStateChanged(boolean);













  @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") public interface SatelliteCommunicationAccessStateCallback {













    method public void onAccessAllowedStateChanged(boolean);













    method public default void onAccessConfigurationChanged(@Nullable android.telephony.satellite.SatelliteAccessConfiguration);















  }





























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










@@ -18675,7 +18675,7 @@ package android.telephony.satellite {













    method @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void provisionSatellite(@NonNull java.util.List<android.telephony.satellite.SatelliteSubscriberInfo>, @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 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);













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













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















    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public int registerForIncomingDatagram(@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 registerForModemStateChanged(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.satellite.SatelliteModemStateCallback);















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










@@ -18704,7 +18704,7 @@ package android.telephony.satellite {













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













    method @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void unregisterForCommunicationAllowedStateChanged(@NonNull android.telephony.satellite.SatelliteCommunicationAllowedStateCallback);













    method @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void unregisterForCommunicationAccessStateChanged(@NonNull android.telephony.satellite.SatelliteCommunicationAccessStateCallback);















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















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















    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);










@@ -18833,9 +18833,9 @@ package android.telephony.satellite {













    method public int describeContents();















    method public int getCarrierId();















    method @NonNull public String getNiddApn();













    method public int getSubId();















    method @NonNull public String getSubscriberId();















    method public int getSubscriberIdType();













    method public int getSubscriptionId();















    method public void writeToParcel(@NonNull android.os.Parcel, int);















    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.satellite.SatelliteSubscriberInfo> CREATOR;















    field public static final int SUBSCRIBER_ID_TYPE_ICCID = 0; // 0x0









@@ -18847,9 +18847,9 @@ package android.telephony.satellite {













    method @NonNull public android.telephony.satellite.SatelliteSubscriberInfo build();















    method @NonNull public android.telephony.satellite.SatelliteSubscriberInfo.Builder setCarrierId(int);















    method @NonNull public android.telephony.satellite.SatelliteSubscriberInfo.Builder setNiddApn(@NonNull String);













    method @NonNull public android.telephony.satellite.SatelliteSubscriberInfo.Builder setSubId(int);















    method @NonNull public android.telephony.satellite.SatelliteSubscriberInfo.Builder setSubscriberId(@NonNull String);















    method @NonNull public android.telephony.satellite.SatelliteSubscriberInfo.Builder setSubscriberIdType(int);













    method @NonNull public android.telephony.satellite.SatelliteSubscriberInfo.Builder setSubscriptionId(int);















  }





























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

























core/java/android/telephony/TelephonyCallback.java



+9
−9




























Original line number
Diff line number
Diff line








@@ -1819,7 +1819,7 @@ public class TelephonyCallback {













     */















    @SystemApi















    @FlaggedApi(Flags.FLAG_SATELLITE_SYSTEM_APIS)













    public interface CarrierRoamingNtnModeListener {













    public interface CarrierRoamingNtnListener {















        /**















         * Callback invoked when carrier roaming non-terrestrial network mode changes.















         *










@@ -2332,8 +2332,8 @@ public class TelephonyCallback {













        public void onCarrierRoamingNtnModeChanged(boolean active) {















            if (!Flags.carrierEnabledSatelliteFlag()) return;





























            CarrierRoamingNtnModeListener listener =













                    (CarrierRoamingNtnModeListener) mTelephonyCallbackWeakRef.get();













            CarrierRoamingNtnListener listener =













                    (CarrierRoamingNtnListener) mTelephonyCallbackWeakRef.get();















            if (listener == null) return;































            Binder.withCleanCallingIdentity(









@@ -2343,8 +2343,8 @@ public class TelephonyCallback {













        public void onCarrierRoamingNtnEligibleStateChanged(boolean eligible) {















            if (!Flags.carrierRoamingNbIotNtn()) return;





























            CarrierRoamingNtnModeListener listener =













                    (CarrierRoamingNtnModeListener) mTelephonyCallbackWeakRef.get();













            CarrierRoamingNtnListener listener =













                    (CarrierRoamingNtnListener) mTelephonyCallbackWeakRef.get();















            if (listener == null) return;































            Binder.withCleanCallingIdentity(() -> mExecutor.execute(









@@ -2355,8 +2355,8 @@ public class TelephonyCallback {













                @NetworkRegistrationInfo.ServiceType int[] availableServices) {















            if (!Flags.carrierRoamingNbIotNtn()) return;





























            CarrierRoamingNtnModeListener listener =













                    (CarrierRoamingNtnModeListener) mTelephonyCallbackWeakRef.get();













            CarrierRoamingNtnListener listener =













                    (CarrierRoamingNtnListener) mTelephonyCallbackWeakRef.get();















            if (listener == null) return;































            Binder.withCleanCallingIdentity(() -> mExecutor.execute(









@@ -2367,8 +2367,8 @@ public class TelephonyCallback {













                @NonNull NtnSignalStrength ntnSignalStrength) {















            if (!Flags.carrierRoamingNbIotNtn()) return;





























            CarrierRoamingNtnModeListener listener =













                    (CarrierRoamingNtnModeListener) mTelephonyCallbackWeakRef.get();













            CarrierRoamingNtnListener listener =













                    (CarrierRoamingNtnListener) mTelephonyCallbackWeakRef.get();















            if (listener == null) return;































            Binder.withCleanCallingIdentity(() -> mExecutor.execute(

































core/java/android/telephony/TelephonyRegistryManager.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -1341,7 +1341,7 @@ public class TelephonyRegistryManager {













                    TelephonyCallback.EVENT_SIMULTANEOUS_CELLULAR_CALLING_SUBSCRIPTIONS_CHANGED);















        }





























        if (telephonyCallback instanceof TelephonyCallback.CarrierRoamingNtnModeListener) {













        if (telephonyCallback instanceof TelephonyCallback.CarrierRoamingNtnListener) {















            eventList.add(TelephonyCallback.EVENT_CARRIER_ROAMING_NTN_MODE_CHANGED);















            eventList.add(TelephonyCallback.EVENT_CARRIER_ROAMING_NTN_ELIGIBLE_STATE_CHANGED);















            eventList.add(TelephonyCallback.EVENT_CARRIER_ROAMING_NTN_AVAILABLE_SERVICES_CHANGED);

































packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryImpl.kt



+1
−1




























Original line number
Diff line number
Diff line








@@ -143,7 +143,7 @@ class MobileConnectionRepositoryImpl(













                    object :















                        TelephonyCallback(),















                        TelephonyCallback.CarrierNetworkListener,













                        TelephonyCallback.CarrierRoamingNtnModeListener,













                        TelephonyCallback.CarrierRoamingNtnListener,















                        TelephonyCallback.DataActivityListener,















                        TelephonyCallback.DataConnectionStateListener,















                        TelephonyCallback.DataEnabledListener,

































packages/SystemUI/src/com/android/systemui/statusbar/pipeline/satellite/data/prod/DeviceBasedSatelliteRepositoryImpl.kt



+8
−8




























Original line number
Diff line number
Diff line








@@ -21,7 +21,7 @@ import android.os.OutcomeReceiver













import android.telephony.TelephonyCallback















import android.telephony.TelephonyManager















import android.telephony.satellite.NtnSignalStrengthCallback













import android.telephony.satellite.SatelliteCommunicationAllowedStateCallback













import android.telephony.satellite.SatelliteCommunicationAccessStateCallback















import android.telephony.satellite.SatelliteManager















import android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_SUCCESS















import android.telephony.satellite.SatelliteModemStateCallback










@@ -263,9 +263,9 @@ constructor(





























    private fun isSatelliteAvailableFlow(sm: SupportedSatelliteManager): Flow<Boolean> =















        conflatedCallbackFlow {













                val callback = SatelliteCommunicationAllowedStateCallback { allowed ->













                val callback = SatelliteCommunicationAccessStateCallback { allowed ->















                    logBuffer.i({ bool1 = allowed }) {













                        "onSatelliteCommunicationAllowedStateChanged: $bool1"













                        "onSatelliteCommunicationAccessAllowedStateChanged: $bool1"















                    }































                    trySend(allowed)









@@ -273,20 +273,20 @@ constructor(





























                var registered = false















                try {













                    logBuffer.i { "registerForCommunicationAllowedStateChanged" }













                    sm.registerForCommunicationAllowedStateChanged(













                    logBuffer.i { "registerForCommunicationAccessStateChanged" }













                    sm.registerForCommunicationAccessStateChanged(















                        bgDispatcher.asExecutor(),















                        callback,















                    )















                    registered = true















                } catch (e: Exception) {













                    logBuffer.e("Error calling registerForCommunicationAllowedStateChanged", e)













                    logBuffer.e("Error calling registerForCommunicationAccessStateChanged", e)















                }































                awaitClose {















                    if (registered) {













                        logBuffer.i { "unRegisterForCommunicationAllowedStateChanged" }













                        sm.unregisterForCommunicationAllowedStateChanged(callback)













                        logBuffer.i { "unRegisterForCommunicationAccessStateChanged" }













                        sm.unregisterForCommunicationAccessStateChanged(callback)















                    }















                }















            }