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

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

Merge "Add attribution tags for VCN and VPN" am: 7eb17c52 

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



Change-Id: Ib748d2d0e530cf6b9e17c440fe8c8b4a7d28c212
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 56f002cd 7eb17c52

services/core/java/com/android/server/VcnManagementService.java

+5 −1
Original line number Diff line number Diff line
@@ -162,6 +162,8 @@ import java.util.concurrent.TimeUnit; 
// TODO(b/180451994): ensure all incoming + outgoing calls have a cleared calling identity

public class VcnManagementService extends IVcnManagementService.Stub {

    @NonNull private static final String TAG = VcnManagementService.class.getSimpleName();

    @NonNull private static final String CONTEXT_ATTRIBUTION_TAG = "VCN";



    private static final long DUMP_TIMEOUT_MILLIS = TimeUnit.SECONDS.toMillis(5);

    private static final int LOCAL_LOG_LINE_COUNT = 512;
@@ -223,7 +225,9 @@ public class VcnManagementService extends IVcnManagementService.Stub { 


    @VisibleForTesting(visibility = Visibility.PRIVATE)

    VcnManagementService(@NonNull Context context, @NonNull Dependencies deps) {

        mContext = requireNonNull(context, "Missing context");

        mContext =

                requireNonNull(context, "Missing context")

                        .createAttributionContext(CONTEXT_ATTRIBUTION_TAG);

        mDeps = requireNonNull(deps, "Missing dependencies");



        mLooper = mDeps.getLooper();

services/core/java/com/android/server/VpnManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ import java.util.List; 
 */

public class VpnManagerService extends IVpnManager.Stub {

    private static final String TAG = VpnManagerService.class.getSimpleName();

    private static final String CONTEXT_ATTRIBUTION_TAG = "VPN_MANAGER";



    @VisibleForTesting

    protected final HandlerThread mHandlerThread;
@@ -157,7 +158,7 @@ public class VpnManagerService extends IVpnManager.Stub { 
    }



    public VpnManagerService(Context context, Dependencies deps) {

        mContext = context;

        mContext = context.createAttributionContext(CONTEXT_ATTRIBUTION_TAG);

        mDeps = deps;

        mHandlerThread = mDeps.makeHandlerThread();

        mHandlerThread.start();