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

Commit 1cd75e34 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[PM] Only enable PIA V2 when the version is larger than BAKLAVA" into main

parents 25e50af4 def3de00
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
@@ -416,6 +417,12 @@ public class PackageUtil {
            return false;
        }

        // Only enable PIA V2 on the version that is newer than BAKLAVA
        if (Build.VERSION.SDK_INT_FULL <= Build.VERSION_CODES_FULL.BAKLAVA) {
            Log.d(LOG_TAG, "The OS version doesn't support PIA version 2");
            return false;
        }

        boolean testOverrideForPiaV2 = Settings.System.getInt(context.getContentResolver(),
                "use_pia_v2", 0) == 1;
        boolean usePiaV2aConfig = Flags.usePiaV2();