Merge "Add attribution tags for VCN and VPN" (7eb17c52) · Commits · e / os / android_frameworks_base

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();

+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();