Loading flags/misc.aconfig +0 −11 Original line number Diff line number Diff line Loading @@ -118,17 +118,6 @@ flag { } } # OWNER=rambowang TARGET=24Q3 flag { name: "hide_preinstalled_carrier_app_at_most_once" namespace: "telephony" description: "Fix bug when preloaded carrier app is uninstalled and lose provisioning data" bug:"158028151" metadata { purpose: PURPOSE_BUGFIX } } # OWNER=sangyun TARGET=24Q3 flag { name: "roaming_notification_for_single_data_network" Loading tests/telephonytests/src/com/android/internal/telephony/CarrierAppUtilsTest.java +0 −8 Original line number Diff line number Diff line Loading @@ -23,7 +23,6 @@ import android.os.Build; import android.os.Bundle; import android.os.CarrierAssociatedAppEntry; import android.os.UserHandle; import android.platform.test.flag.junit.SetFlagsRule; import android.provider.Settings; import android.telephony.TelephonyManager; import android.test.mock.MockContentProvider; Loading @@ -35,12 +34,9 @@ import androidx.test.InstrumentationRegistry; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; import com.android.internal.telephony.flags.Flags; import org.junit.After; import org.junit.Before; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; Loading @@ -63,9 +59,6 @@ public class CarrierAppUtilsTest { private static final int USER_ID = 12345; private static final String CALLING_PACKAGE = "phone"; @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); // Mocked classes private Context mContext; private PackageManager mPackageManager; Loading @@ -86,7 +79,6 @@ public class CarrierAppUtilsTest { @Before public void setUp() throws Exception { mSetFlagsRule.enableFlags(Flags.FLAG_HIDE_PREINSTALLED_CARRIER_APP_AT_MOST_ONCE); System.setProperty("dexmaker.dexcache", InstrumentationRegistry.getTargetContext().getCacheDir().getPath()); Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); Loading Loading
flags/misc.aconfig +0 −11 Original line number Diff line number Diff line Loading @@ -118,17 +118,6 @@ flag { } } # OWNER=rambowang TARGET=24Q3 flag { name: "hide_preinstalled_carrier_app_at_most_once" namespace: "telephony" description: "Fix bug when preloaded carrier app is uninstalled and lose provisioning data" bug:"158028151" metadata { purpose: PURPOSE_BUGFIX } } # OWNER=sangyun TARGET=24Q3 flag { name: "roaming_notification_for_single_data_network" Loading
tests/telephonytests/src/com/android/internal/telephony/CarrierAppUtilsTest.java +0 −8 Original line number Diff line number Diff line Loading @@ -23,7 +23,6 @@ import android.os.Build; import android.os.Bundle; import android.os.CarrierAssociatedAppEntry; import android.os.UserHandle; import android.platform.test.flag.junit.SetFlagsRule; import android.provider.Settings; import android.telephony.TelephonyManager; import android.test.mock.MockContentProvider; Loading @@ -35,12 +34,9 @@ import androidx.test.InstrumentationRegistry; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; import com.android.internal.telephony.flags.Flags; import org.junit.After; import org.junit.Before; import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; Loading @@ -63,9 +59,6 @@ public class CarrierAppUtilsTest { private static final int USER_ID = 12345; private static final String CALLING_PACKAGE = "phone"; @Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(); // Mocked classes private Context mContext; private PackageManager mPackageManager; Loading @@ -86,7 +79,6 @@ public class CarrierAppUtilsTest { @Before public void setUp() throws Exception { mSetFlagsRule.enableFlags(Flags.FLAG_HIDE_PREINSTALLED_CARRIER_APP_AT_MOST_ONCE); System.setProperty("dexmaker.dexcache", InstrumentationRegistry.getTargetContext().getCacheDir().getPath()); Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); Loading