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

Commit 144325a2 authored by Sumedh Sen's avatar Sumedh Sen
Browse files

Add a System Setting to act as a test override for Pia V2 

Using this setting, CTS tests can control which Pia to use to run the
test on

Bug: 382323450
Test: atest CtsPackageInstallTestCases CtsUpdateOwnershipEnforcementTestCases
Flag: EXEMPT. Test only
Change-Id: I08a4a51ceeaf7581aa9411230a9fd5e1302d1ebf
parent bd7cd391

packages/PackageInstaller/src/com/android/packageinstaller/InstallStart.java

+22 −2
Original line number Original line Diff line number Diff line
@@ -36,6 +36,7 @@ import android.os.Build; 
import android.os.Bundle;

import android.os.Bundle;

import android.os.Process;

import android.os.Process;

import android.os.UserManager;

import android.os.UserManager;

import android.provider.Settings;

import android.text.TextUtils;

import android.text.TextUtils;

import android.util.EventLog;

import android.util.EventLog;

import android.util.Log;

import android.util.Log;
@@ -62,9 +63,12 @@ public class InstallStart extends Activity { 
    protected void onCreate(@Nullable Bundle savedInstanceState) {

    protected void onCreate(@Nullable Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        super.onCreate(savedInstanceState);





        boolean testOverrideForPiaV2 = Settings.System.getInt(getContentResolver(),

                "use_pia_v2", 0) == 1;

        boolean usePiaV2aConfig = usePiaV2();





        if (usePiaV2()) {

        if (usePiaV2aConfig || testOverrideForPiaV2) {

            Log.i(TAG, "Using Pia V2");

            logReasonForDebug(usePiaV2aConfig, testOverrideForPiaV2);





            Intent piaV2 = new Intent(getIntent());

            Intent piaV2 = new Intent(getIntent());

            piaV2.putExtra(InstallLaunch.EXTRA_CALLING_PKG_NAME, getLaunchedFromPackage());

            piaV2.putExtra(InstallLaunch.EXTRA_CALLING_PKG_NAME, getLaunchedFromPackage());
@@ -381,4 +385,20 @@ public class InstallStart extends Activity { 
        }

        }

        return null;

        return null;

    }

    }



    private void logReasonForDebug(boolean usePiaV2aConfig, boolean testOverrideForPiaV2) {

        StringBuilder sb = new StringBuilder("Using Pia V2 due to: ");

        boolean aconfigUsed = false;

        if (usePiaV2aConfig) {

            sb.append("aconfig flag USE_PIA_V2");

            aconfigUsed = true;

        }

        if (testOverrideForPiaV2) {

            if (aconfigUsed) {

                sb.append(" and ");

            }

            sb.append("testOverrideForPiaV2.");

        }

        Log.i(TAG, sb.toString());

    }

}
 
}