Merge "Revert "Add attribution tags for VCN and VPN""

// 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;

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

 */

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;

    }

    public VpnManagerService(Context context, Dependencies deps) {

        mContext = context.createAttributionContext(CONTEXT_ATTRIBUTION_TAG);

        mContext = context;

        mDeps = deps;

        mHandlerThread = mDeps.makeHandlerThread();

        mHandlerThread.start();