From 85029a4e5f21cc593335ddeb9200c165aa128e57 Mon Sep 17 00:00:00 2001 From: Chiachang Wang Date: Wed, 7 Jun 2023 08:46:51 +0000 Subject: [PATCH] Revert "Add attribution tags for VCN and VPN" This reverts commit 694b1875978e730144f448432787a4bd66ef7297. Reason for revert: Change-Id: I4665c257c3cca28f0f657ba0f653ba2068f0d5e2 --- .../core/java/com/android/server/VcnManagementService.java | 6 +----- .../core/java/com/android/server/VpnManagerService.java | 3 +-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/services/core/java/com/android/server/VcnManagementService.java b/services/core/java/com/android/server/VcnManagementService.java index 5f8b441e30310..e8c85ce68f220 100644 --- a/services/core/java/com/android/server/VcnManagementService.java +++ b/services/core/java/com/android/server/VcnManagementService.java @@ -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(); diff --git a/services/core/java/com/android/server/VpnManagerService.java b/services/core/java/com/android/server/VpnManagerService.java index c8b00d7f7d0f1..2b43ef48b9225 100644 --- a/services/core/java/com/android/server/VpnManagerService.java +++ b/services/core/java/com/android/server/VpnManagerService.java @@ -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();