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

Commit 08fb7395 authored by Haining Chen's avatar Haining Chen
Browse files

Use only the related flag in test setup 

Explicitly save and restore the enable_biometric_property_verification
flag in test setup and teardown, without impacting other flags within
the same namespace. This will remove the requirements of adding
unrelated flags into WritableFlags.

Bug: 389790699
Flag: TEST_ONLY
Test: atest BinaryTransparencyServiceTest
Change-Id: I7602ec86c9f8fb90bb77016b09435e060d44cae8
parent 15e6ffaf

services/tests/servicestests/src/com/android/server/BinaryTransparencyServiceTest.java

+9 −14
Original line number Diff line number Diff line
@@ -46,17 +46,14 @@ import android.os.RemoteException; 
import android.os.ResultReceiver;

import android.os.SystemProperties;

import android.provider.DeviceConfig;

import android.util.Log;



import androidx.test.core.app.ApplicationProvider;

import androidx.test.ext.junit.runners.AndroidJUnit4;



import com.android.internal.util.FrameworkStatsLog;

import com.android.internal.os.IBinaryTransparencyService;

import com.android.server.pm.BackgroundInstallControlService;

import com.android.internal.util.FrameworkStatsLog;

import com.android.server.pm.BackgroundInstallControlCallbackHelper;

import com.android.server.pm.pkg.AndroidPackage;

import com.android.server.pm.pkg.AndroidPackageSplit;

import com.android.server.pm.BackgroundInstallControlService;

import com.android.server.pm.pkg.PackageStateInternal;



import org.junit.After;
@@ -82,7 +79,7 @@ public class BinaryTransparencyServiceTest { 
    private Context mContext;

    private BinaryTransparencyService mBinaryTransparencyService;

    private BinaryTransparencyService.BinaryTransparencyServiceImpl mTestInterface;

    private DeviceConfig.Properties mOriginalBiometricsFlags;

    private String mOriginalBiometricsFlag;



    @Mock

    private BinaryTransparencyService.BiometricLogger mBiometricLogger;
@@ -117,17 +114,15 @@ public class BinaryTransparencyServiceTest { 


        mBinaryTransparencyService = new BinaryTransparencyService(mContext, mBiometricLogger);

        mTestInterface = mBinaryTransparencyService.new BinaryTransparencyServiceImpl();

        mOriginalBiometricsFlags = DeviceConfig.getProperties(DeviceConfig.NAMESPACE_BIOMETRICS);

        mOriginalBiometricsFlag = DeviceConfig.getProperty(DeviceConfig.NAMESPACE_BIOMETRICS,

                BinaryTransparencyService.KEY_ENABLE_BIOMETRIC_PROPERTY_VERIFICATION);

    }



    @After

    public void tearDown() throws Exception {

        try {

            DeviceConfig.setProperties(mOriginalBiometricsFlags);

        } catch (DeviceConfig.BadConfigException e) {

            Log.e(TAG, "Failed to reset biometrics flags to the original values before test. "

                    + e);

        }

    public void tearDown() {

        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_BIOMETRICS,

                BinaryTransparencyService.KEY_ENABLE_BIOMETRIC_PROPERTY_VERIFICATION,

                mOriginalBiometricsFlag, false /* makeDefault */);

        LocalServices.removeServiceForTest(PackageManagerInternal.class);

    }