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

Commit 10737159 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "profcollect: Do not upload profiles if verity is disabled" into main am: 23dbe8dd 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3368820



Change-Id: Id4baba4d4d157c011b1e28cd14776049cb1f663f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5b490766 23dbe8dd

services/profcollect/src/com/android/server/profcollect/ProfcollectForwardingService.java

+12 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ public final class ProfcollectForwardingService extends SystemService { 
    private int mUsageSetting;

    private boolean mUploadEnabled;



    private static boolean sVerityEnforced;

    private boolean mAdbActive;



    private IProfCollectd mIProfcollect;
@@ -117,6 +118,13 @@ public final class ProfcollectForwardingService extends SystemService { 
            mUsageSetting = -1;

        }



        // Check verity, disable profile upload if not enforced.

        final String verityMode = SystemProperties.get("ro.boot.veritymode");

        sVerityEnforced = verityMode.equals("enforcing");

        if (!sVerityEnforced) {

            Log.d(LOG_TAG, "verity is not enforced: " + verityMode);

        }



        mUploadEnabled =

            context.getResources().getBoolean(R.bool.config_profcollectReportUploaderEnabled);
@@ -373,6 +381,10 @@ public final class ProfcollectForwardingService extends SystemService { 
                Log.i(LOG_TAG, "Upload is not enabled.");

                return;

            }

            if (!sVerityEnforced) {

                Log.i(LOG_TAG, "Verity is not enforced.");

                return;

            }

            Intent intent = new Intent()

                    .setPackage("com.android.shell")

                    .setAction("com.android.shell.action.PROFCOLLECT_UPLOAD")