Merge "Revert "Add attribution tags for VCN and VPN"" am: fe8c8bec9d am: 69d54da0d6

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

Change-Id: I9c0a840aebb74ea231492c272031063c4c2a6600
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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 5f8b441e3031..e8c85ce68f22 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 0d423d8a0a62..9b4f9683d550 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();