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

Commit fa78c4a7 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Revert "Add attribution tags for VCN and VPN"" am: fe8c8bec am:... 

Merge "Revert "Add attribution tags for VCN and VPN"" am: fe8c8bec am: 69d54da0 am: 0c1b3509 am: 8817fe63 am: 14c502a5

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



Change-Id: I7630b33f73572f1dd0b4f7d965b0e1327f6a9f89
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6e42f982 14c502a5

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

+1 −5
Original line number Diff line number Diff line
@@ -162,8 +162,6 @@ 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;
@@ -225,9 +223,7 @@ public class VcnManagementService extends IVcnManagementService.Stub { 


    @VisibleForTesting(visibility = Visibility.PRIVATE)

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

        mContext =

                requireNonNull(context, "Missing context")

                        .createAttributionContext(CONTEXT_ATTRIBUTION_TAG);

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

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



        mLooper = mDeps.getLooper();

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

+1 −2
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ 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;
@@ -158,7 +157,7 @@ public class VpnManagerService extends IVpnManager.Stub { 
    }



    public VpnManagerService(Context context, Dependencies deps) {

        mContext = context.createAttributionContext(CONTEXT_ATTRIBUTION_TAG);

        mContext = context;

        mDeps = deps;

        mHandlerThread = mDeps.makeHandlerThread();

        mHandlerThread.start();