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

Commit f8ff5bab authored by JW Wang's avatar JW Wang
Browse files

Replace deprecated InstrumentationRegistry (2/n) 

Bug: 143999213
Test: atest StagedRollbackTest
Change-Id: I647cecf343bdb43dbede677e015b4844f99e49ff
parent 94b0adcf

tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/StagedRollbackTest.java

+7 −7
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ import android.os.ParcelFileDescriptor; 
import android.provider.DeviceConfig;

import android.provider.DeviceConfig;

import android.text.TextUtils;

import android.text.TextUtils;





import androidx.test.InstrumentationRegistry;

import androidx.test.platform.app.InstrumentationRegistry;





import com.android.cts.install.lib.Install;

import com.android.cts.install.lib.Install;

import com.android.cts.install.lib.InstallUtils;

import com.android.cts.install.lib.InstallUtils;
@@ -184,7 +184,7 @@ public class StagedRollbackTest { 
    @Test

    @Test

    public void testNativeWatchdogTriggersRollback_Phase1() throws Exception {

    public void testNativeWatchdogTriggersRollback_Phase1() throws Exception {

        resetModuleMetadataPackage();

        resetModuleMetadataPackage();

        Context context = InstrumentationRegistry.getContext();

        Context context = InstrumentationRegistry.getInstrumentation().getContext();

        PackageInfo metadataPackageInfo = context.getPackageManager().getPackageInfo(

        PackageInfo metadataPackageInfo = context.getPackageManager().getPackageInfo(

                MODULE_META_DATA_PACKAGE, 0);

                MODULE_META_DATA_PACKAGE, 0);

        String metadataApkPath = metadataPackageInfo.applicationInfo.sourceDir;

        String metadataApkPath = metadataPackageInfo.applicationInfo.sourceDir;
@@ -268,7 +268,7 @@ public class StagedRollbackTest { 
    private static String getNetworkStackPackageName() {

    private static String getNetworkStackPackageName() {

        Intent intent = new Intent(NETWORK_STACK_CONNECTOR_CLASS);

        Intent intent = new Intent(NETWORK_STACK_CONNECTOR_CLASS);

        ComponentName comp = intent.resolveSystemService(

        ComponentName comp = intent.resolveSystemService(

                InstrumentationRegistry.getContext().getPackageManager(), 0);

                InstrumentationRegistry.getInstrumentation().getContext().getPackageManager(), 0);

        return comp.getPackageName();

        return comp.getPackageName();

    }

    }
@@ -289,8 +289,8 @@ public class StagedRollbackTest { 
        assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(1);

        assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(1);





        int sessionId = Install.single(TestApp.A2).setStaged().setEnableRollback().commit();

        int sessionId = Install.single(TestApp.A2).setStaged().setEnableRollback().commit();

        PackageInstaller pi = InstrumentationRegistry.getContext().getPackageManager()

        PackageInstaller pi = InstrumentationRegistry.getInstrumentation().getContext()

                .getPackageInstaller();

                .getPackageManager().getPackageInstaller();

        pi.abandonSession(sessionId);

        pi.abandonSession(sessionId);





        // Remove the first intent sender result, so that the next staged install session does not

        // Remove the first intent sender result, so that the next staged install session does not
@@ -346,8 +346,8 @@ public class StagedRollbackTest { 




    @Nullable

    @Nullable

    private static String getModuleMetadataPackageName() {

    private static String getModuleMetadataPackageName() {

        String packageName = InstrumentationRegistry.getContext().getResources().getString(

        String packageName = InstrumentationRegistry.getInstrumentation().getContext()

                R.string.config_defaultModuleMetadataProvider);

                .getResources().getString(R.string.config_defaultModuleMetadataProvider);

        if (TextUtils.isEmpty(packageName)) {

        if (TextUtils.isEmpty(packageName)) {

            return null;

            return null;

        }

        }