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

Commit 83e00684 authored by Winson's avatar Winson
Browse files

Add more domain verification debug functionality 

Bug: 163565712

Test: none, just for debugging

Change-Id: I7b88d4253b5f02fda69b0305ef6e82e7a464ea6a
parent b0432c1f

services/core/java/com/android/server/pm/verify/domain/DomainVerificationDebug.java

+13 −1
Original line number Diff line number Diff line
@@ -32,15 +32,27 @@ import android.util.SparseArray; 


import com.android.internal.util.CollectionUtils;

import com.android.server.pm.PackageSetting;

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

import com.android.server.pm.verify.domain.models.DomainVerificationPkgState;

import com.android.server.pm.verify.domain.models.DomainVerificationStateMap;

import com.android.server.pm.verify.domain.models.DomainVerificationUserState;

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



import java.util.Arrays;



@SuppressWarnings("PointlessBooleanExpression")

public class DomainVerificationDebug {



    // Disable to turn off all logging. This is used to allow a "basic" set of debug flags to be

    // enabled and checked in, without having everything be on or off.

    public static final boolean DEBUG_ANY = false;



    // Enable to turn on all logging. Requires enabling DEBUG_ANY.

    public static final boolean DEBUG_ALL = false;



    public static final boolean DEBUG_APPROVAL = DEBUG_ANY && (DEBUG_ALL || true);

    public static final boolean DEBUG_BROADCASTS = DEBUG_ANY && (DEBUG_ALL || false);

    public static final boolean DEBUG_PROXIES = DEBUG_ANY && (DEBUG_ALL || false);



    @NonNull

    private final DomainVerificationCollector mCollector;

services/core/java/com/android/server/pm/verify/domain/DomainVerificationService.java

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ public class DomainVerificationService extends SystemService 


    private static final String TAG = "DomainVerificationService";



    public static final boolean DEBUG_APPROVAL = true;

    public static final boolean DEBUG_APPROVAL = DomainVerificationDebug.DEBUG_APPROVAL;



    /**

     * The new user preference API for verifying domains marked autoVerify=true in

services/core/java/com/android/server/pm/verify/domain/proxy/DomainVerificationProxy.java

+3 −2
Original line number Diff line number Diff line
@@ -23,9 +23,10 @@ import android.content.Context; 
import android.util.Slog;



import com.android.server.DeviceIdleInternal;

import com.android.server.pm.verify.domain.DomainVerificationMessageCodes;

import com.android.server.pm.verify.domain.DomainVerificationCollector;

import com.android.server.pm.verify.domain.DomainVerificationDebug;

import com.android.server.pm.verify.domain.DomainVerificationManagerInternal;

import com.android.server.pm.verify.domain.DomainVerificationMessageCodes;



import java.util.Objects;

import java.util.Set;
@@ -35,7 +36,7 @@ public interface DomainVerificationProxy { 


    String TAG = "DomainVerificationProxy";



    boolean DEBUG_PROXIES = false;

    boolean DEBUG_PROXIES = DomainVerificationDebug.DEBUG_PROXIES;



    static <ConnectionType extends DomainVerificationProxyV1.Connection

            & DomainVerificationProxyV2.Connection> DomainVerificationProxy makeProxy(

services/core/java/com/android/server/pm/verify/domain/proxy/DomainVerificationProxyV1.java

+3 −2
Original line number Diff line number Diff line
@@ -37,10 +37,11 @@ import android.util.Pair; 
import android.util.Slog;



import com.android.internal.annotations.GuardedBy;

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

import com.android.server.pm.verify.domain.DomainVerificationCollector;

import com.android.server.pm.verify.domain.DomainVerificationDebug;

import com.android.server.pm.verify.domain.DomainVerificationManagerInternal;

import com.android.server.pm.verify.domain.DomainVerificationMessageCodes;

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



import java.util.Collections;

import java.util.List;
@@ -52,7 +53,7 @@ public class DomainVerificationProxyV1 implements DomainVerificationProxy { 


    private static final String TAG = "DomainVerificationProxyV1";



    private static final boolean DEBUG_BROADCASTS = false;

    private static final boolean DEBUG_BROADCASTS = DomainVerificationDebug.DEBUG_BROADCASTS;



    @NonNull

    private final Context mContext;

services/core/java/com/android/server/pm/verify/domain/proxy/DomainVerificationProxyV2.java

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.os.Process; 
import android.os.UserHandle;

import android.util.Slog;



import com.android.server.pm.verify.domain.DomainVerificationDebug;

import com.android.server.pm.verify.domain.DomainVerificationMessageCodes;



import java.util.Set;
@@ -36,7 +37,7 @@ public class DomainVerificationProxyV2 implements DomainVerificationProxy { 


    private static final String TAG = "DomainVerificationProxyV2";



    private static final boolean DEBUG_BROADCASTS = true;

    private static final boolean DEBUG_BROADCASTS = DomainVerificationDebug.DEBUG_BROADCASTS;



    @NonNull

    private final Context mContext;