remove aflag declaration OEM_ENABLED_SATELLITE_FLAG (b693b51a) · Commits · e / os / android_frameworks_base

core/api/current.txt

+5 −5

core/api/system-current.txt

+161 −161

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/os/ConfigUpdate.java

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -16,7 +16,6 @@

	package android.os;		package android.os;

	import android.annotation.FlaggedApi;
	import android.annotation.SdkConstant;		import android.annotation.SdkConstant;
	import android.annotation.SdkConstant.SdkConstantType;		import android.annotation.SdkConstant.SdkConstantType;
	import android.annotation.SystemApi;		import android.annotation.SystemApi;
	@@ -144,7 +143,6 @@ public final class ConfigUpdate {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	@FlaggedApi(com.android.internal.telephony.flags.Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)
	@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
	public static final String ACTION_UPDATE_CONFIG = "android.os.action.UPDATE_CONFIG";		public static final String ACTION_UPDATE_CONFIG = "android.os.action.UPDATE_CONFIG";

	@@ -172,7 +170,6 @@ public final class ConfigUpdate {
	* @hide		* @hide
	*/		*/
	@SystemApi		@SystemApi
	@FlaggedApi(com.android.internal.telephony.flags.Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)
	public static final String EXTRA_DOMAIN = "android.os.extra.DOMAIN";		public static final String EXTRA_DOMAIN = "android.os.extra.DOMAIN";

	private ConfigUpdate() {		private ConfigUpdate() {

packages/SettingsLib/tests/robotests/src/com/android/settingslib/satellite/SatelliteDialogUtilsTest.kt

+2 −9

Original line number	Original line	Diff line number	Diff line
	@@ -17,7 +17,6 @@
	package com.android.settingslib.satellite		package com.android.settingslib.satellite

	import android.content.Context		import android.content.Context
	import android.platform.test.annotations.RequiresFlagsEnabled
	import android.telephony.satellite.SatelliteManager		import android.telephony.satellite.SatelliteManager
	import android.telephony.satellite.SatelliteManager.SATELLITE_MODEM_STATE_ENABLING_SATELLITE		import android.telephony.satellite.SatelliteManager.SATELLITE_MODEM_STATE_ENABLING_SATELLITE
	import android.telephony.satellite.SatelliteManager.SATELLITE_MODEM_STATE_OFF		import android.telephony.satellite.SatelliteManager.SATELLITE_MODEM_STATE_OFF
	@@ -25,7 +24,6 @@ import android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_MODEM_ERROR
	import android.telephony.satellite.SatelliteModemStateCallback		import android.telephony.satellite.SatelliteModemStateCallback
	import android.util.AndroidRuntimeException		import android.util.AndroidRuntimeException
	import androidx.test.core.app.ApplicationProvider		import androidx.test.core.app.ApplicationProvider
	import com.android.internal.telephony.flags.Flags
	import com.android.settingslib.satellite.SatelliteDialogUtils.TYPE_IS_WIFI		import com.android.settingslib.satellite.SatelliteDialogUtils.TYPE_IS_WIFI
	import kotlinx.coroutines.CoroutineScope		import kotlinx.coroutines.CoroutineScope
	import kotlinx.coroutines.Dispatchers		import kotlinx.coroutines.Dispatchers
	@@ -38,12 +36,12 @@ import org.junit.Test
	import org.junit.runner.RunWith		import org.junit.runner.RunWith
	import org.mockito.Mock		import org.mockito.Mock
	import org.mockito.Mockito.any		import org.mockito.Mockito.any
			import org.mockito.Mockito.verify
	import org.mockito.Mockito.`when`		import org.mockito.Mockito.`when`
	import org.mockito.Spy		import org.mockito.Spy
			import org.mockito.internal.verification.Times
	import org.mockito.junit.MockitoJUnit		import org.mockito.junit.MockitoJUnit
	import org.mockito.junit.MockitoRule		import org.mockito.junit.MockitoRule
	import org.mockito.Mockito.verify
	import org.mockito.internal.verification.Times
	import org.robolectric.RobolectricTestRunner		import org.robolectric.RobolectricTestRunner

	@RunWith(RobolectricTestRunner::class)		@RunWith(RobolectricTestRunner::class)
	@@ -66,7 +64,6 @@ class SatelliteDialogUtilsTest {
	}		}

	@Test		@Test
	@RequiresFlagsEnabled(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)
	fun mayStartSatelliteWarningDialog_satelliteIsOn_showWarningDialog(): Unit = runBlocking {		fun mayStartSatelliteWarningDialog_satelliteIsOn_showWarningDialog(): Unit = runBlocking {
	`when`(satelliteManager.registerForModemStateChanged(any(), any()))		`when`(satelliteManager.registerForModemStateChanged(any(), any()))
	.thenAnswer { invocation ->		.thenAnswer { invocation ->
	@@ -87,7 +84,6 @@ class SatelliteDialogUtilsTest {
	}		}

	@Test		@Test
	@RequiresFlagsEnabled(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)
	fun mayStartSatelliteWarningDialog_satelliteIsOff_notShowWarningDialog() = runBlocking {		fun mayStartSatelliteWarningDialog_satelliteIsOff_notShowWarningDialog() = runBlocking {
	`when`(satelliteManager.registerForModemStateChanged(any(), any()))		`when`(satelliteManager.registerForModemStateChanged(any(), any()))
	.thenAnswer { invocation ->		.thenAnswer { invocation ->
	@@ -107,7 +103,6 @@ class SatelliteDialogUtilsTest {
	}		}

	@Test		@Test
	@RequiresFlagsEnabled(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)
	fun mayStartSatelliteWarningDialog_noSatelliteManager_notShowWarningDialog() = runBlocking {		fun mayStartSatelliteWarningDialog_noSatelliteManager_notShowWarningDialog() = runBlocking {
	`when`(context.getSystemService(SatelliteManager::class.java)).thenReturn(null)		`when`(context.getSystemService(SatelliteManager::class.java)).thenReturn(null)

	@@ -120,7 +115,6 @@ class SatelliteDialogUtilsTest {
	}		}

	@Test		@Test
	@RequiresFlagsEnabled(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)
	fun mayStartSatelliteWarningDialog_satelliteErrorResult_notShowWarningDialog() = runBlocking {		fun mayStartSatelliteWarningDialog_satelliteErrorResult_notShowWarningDialog() = runBlocking {
	`when`(satelliteManager.registerForModemStateChanged(any(), any()))		`when`(satelliteManager.registerForModemStateChanged(any(), any()))
	.thenReturn(SATELLITE_RESULT_MODEM_ERROR)		.thenReturn(SATELLITE_RESULT_MODEM_ERROR)
	@@ -134,7 +128,6 @@ class SatelliteDialogUtilsTest {
	}		}

	@Test		@Test
	@RequiresFlagsEnabled(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)
	fun mayStartSatelliteWarningDialog_phoneCrash_notShowWarningDialog() = runBlocking {		fun mayStartSatelliteWarningDialog_phoneCrash_notShowWarningDialog() = runBlocking {
	`when`(satelliteManager.registerForModemStateChanged(any(), any()))		`when`(satelliteManager.registerForModemStateChanged(any(), any()))
	.thenThrow(IllegalStateException("Telephony is null!!!"))		.thenThrow(IllegalStateException("Telephony is null!!!"))

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/AirplaneModeTileTest.kt

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -23,7 +23,6 @@ import android.platform.test.flag.junit.FlagsParameterization.allCombinationsOf
	import android.testing.TestableLooper		import android.testing.TestableLooper
	import androidx.test.filters.SmallTest		import androidx.test.filters.SmallTest
	import com.android.internal.logging.MetricsLogger		import com.android.internal.logging.MetricsLogger
	import com.android.internal.telephony.flags.Flags
	import com.android.systemui.SysuiTestCase		import com.android.systemui.SysuiTestCase
	import com.android.systemui.broadcast.BroadcastDispatcher		import com.android.systemui.broadcast.BroadcastDispatcher
	import com.android.systemui.classifier.FalsingManagerFake		import com.android.systemui.classifier.FalsingManagerFake
	@@ -130,18 +129,8 @@ class AirplaneModeTileTest(flags: FlagsParameterization) : SysuiTestCase() {
	assertThat(state.icon).isEqualTo(createExpectedIcon(R.drawable.qs_airplane_icon_on))		assertThat(state.icon).isEqualTo(createExpectedIcon(R.drawable.qs_airplane_icon_on))
	}		}

	@Test
	fun handleClick_noSatelliteFeature_directSetAirplaneMode() {
	mSetFlagsRule.disableFlags(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)

	mTile.handleClick(null)

	verify(mConnectivityManager).setAirplaneMode(any())
	}

	@Test		@Test
	fun handleClick_hasSatelliteFeatureButClickIsProcessing_doNothing() {		fun handleClick_hasSatelliteFeatureButClickIsProcessing_doNothing() {
	mSetFlagsRule.enableFlags(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)
	Mockito.`when`(mClickJob.isCompleted).thenReturn(false)		Mockito.`when`(mClickJob.isCompleted).thenReturn(false)
	mTile.mClickJob = mClickJob		mTile.mClickJob = mClickJob

Original line number	Original line	Diff line number	Diff line
	@@ -46375,7 +46375,7 @@ package android.telephony {
	field public static final int OUT_OF_NETWORK = 11; // 0xb		field public static final int OUT_OF_NETWORK = 11; // 0xb
	field public static final int OUT_OF_SERVICE = 18; // 0x12		field public static final int OUT_OF_SERVICE = 18; // 0x12
	field public static final int POWER_OFF = 17; // 0x11		field public static final int POWER_OFF = 17; // 0x11
	field @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public static final int SATELLITE_ENABLED = 82; // 0x52		field public static final int SATELLITE_ENABLED = 82; // 0x52
	field public static final int SERVER_ERROR = 12; // 0xc		field public static final int SERVER_ERROR = 12; // 0xc
	field public static final int SERVER_UNREACHABLE = 9; // 0x9		field public static final int SERVER_UNREACHABLE = 9; // 0x9
	field public static final int TIMED_OUT = 13; // 0xd		field public static final int TIMED_OUT = 13; // 0xd
	@@ -47077,7 +47077,7 @@ package android.telephony {
	method public int getSubscriptionType();		method public int getSubscriptionType();
	method public int getUsageSetting();		method public int getUsageSetting();
	method public boolean isEmbedded();		method public boolean isEmbedded();
	method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public boolean isOnlyNonTerrestrialNetwork();		method public boolean isOnlyNonTerrestrialNetwork();
	method public boolean isOpportunistic();		method public boolean isOpportunistic();
	method public void writeToParcel(android.os.Parcel, int);		method public void writeToParcel(android.os.Parcel, int);
	field @NonNull public static final android.os.Parcelable.Creator<android.telephony.SubscriptionInfo> CREATOR;		field @NonNull public static final android.os.Parcelable.Creator<android.telephony.SubscriptionInfo> CREATOR;
	@@ -47528,7 +47528,7 @@ package android.telephony {
	field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final int ERI_FLASH = 2; // 0x2		field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final int ERI_FLASH = 2; // 0x2
	field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final int ERI_OFF = 1; // 0x1		field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final int ERI_OFF = 1; // 0x1
	field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final int ERI_ON = 0; // 0x0		field @Deprecated @FlaggedApi("com.android.internal.telephony.flags.deprecate_cdma") public static final int ERI_ON = 0; // 0x0
	field @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public static final String EVENT_DISPLAY_EMERGENCY_MESSAGE = "android.telephony.event.DISPLAY_EMERGENCY_MESSAGE";		field public static final String EVENT_DISPLAY_EMERGENCY_MESSAGE = "android.telephony.event.DISPLAY_EMERGENCY_MESSAGE";
	field public static final String EXTRA_ACTIVE_SIM_SUPPORTED_COUNT = "android.telephony.extra.ACTIVE_SIM_SUPPORTED_COUNT";		field public static final String EXTRA_ACTIVE_SIM_SUPPORTED_COUNT = "android.telephony.extra.ACTIVE_SIM_SUPPORTED_COUNT";
	field public static final String EXTRA_APN_PROTOCOL = "android.telephony.extra.APN_PROTOCOL";		field public static final String EXTRA_APN_PROTOCOL = "android.telephony.extra.APN_PROTOCOL";
	field public static final String EXTRA_APN_TYPE = "android.telephony.extra.APN_TYPE";		field public static final String EXTRA_APN_TYPE = "android.telephony.extra.APN_TYPE";
	@@ -47537,8 +47537,8 @@ package android.telephony {
	field public static final String EXTRA_CARRIER_NAME = "android.telephony.extra.CARRIER_NAME";		field public static final String EXTRA_CARRIER_NAME = "android.telephony.extra.CARRIER_NAME";
	field public static final String EXTRA_DATA_FAIL_CAUSE = "android.telephony.extra.DATA_FAIL_CAUSE";		field public static final String EXTRA_DATA_FAIL_CAUSE = "android.telephony.extra.DATA_FAIL_CAUSE";
	field public static final String EXTRA_DEFAULT_NETWORK_AVAILABLE = "android.telephony.extra.DEFAULT_NETWORK_AVAILABLE";		field public static final String EXTRA_DEFAULT_NETWORK_AVAILABLE = "android.telephony.extra.DEFAULT_NETWORK_AVAILABLE";
	field @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public static final String EXTRA_EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE = "android.telephony.extra.EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE";		field public static final String EXTRA_EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE = "android.telephony.extra.EMERGENCY_CALL_TO_SATELLITE_HANDOVER_TYPE";
	field @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public static final String EXTRA_EMERGENCY_CALL_TO_SATELLITE_LAUNCH_INTENT = "android.telephony.extra.EMERGENCY_CALL_TO_SATELLITE_LAUNCH_INTENT";		field public static final String EXTRA_EMERGENCY_CALL_TO_SATELLITE_LAUNCH_INTENT = "android.telephony.extra.EMERGENCY_CALL_TO_SATELLITE_LAUNCH_INTENT";
	field public static final String EXTRA_HIDE_PUBLIC_SETTINGS = "android.telephony.extra.HIDE_PUBLIC_SETTINGS";		field public static final String EXTRA_HIDE_PUBLIC_SETTINGS = "android.telephony.extra.HIDE_PUBLIC_SETTINGS";
	field @Deprecated public static final String EXTRA_INCOMING_NUMBER = "incoming_number";		field @Deprecated public static final String EXTRA_INCOMING_NUMBER = "incoming_number";
	field public static final String EXTRA_IS_REFRESH = "android.telephony.extra.IS_REFRESH";		field public static final String EXTRA_IS_REFRESH = "android.telephony.extra.IS_REFRESH";