Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add attribution tags for VCN and VPN"

Browse Source
This commit is contained in:
Treehugger Robot
2023-06-07 02:12:55 +00:00
committed by Gerrit Code Review
parent 92218b9e09 694b187597
commit 7eb17c5215
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/VcnManagementService.java
View File

@@ -162,6 +162,8 @@ import java.util.concurrent.TimeUnit;
// TODO(b/180451994): ensure all incoming + outgoing calls have a cleared calling identity // TODO(b/180451994): ensure all incoming + outgoing calls have a cleared calling identity
public class VcnManagementService extends IVcnManagementService.Stub { public class VcnManagementService extends IVcnManagementService.Stub {
@NonNull private static final String TAG = VcnManagementService.class.getSimpleName(); @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 long DUMP_TIMEOUT_MILLIS = TimeUnit.SECONDS.toMillis(5);
private static final int LOCAL_LOG_LINE_COUNT = 512; private static final int LOCAL_LOG_LINE_COUNT = 512;
@@ -223,7 +225,9 @@ public class VcnManagementService extends IVcnManagementService.Stub {
@VisibleForTesting(visibility = Visibility.PRIVATE) @VisibleForTesting(visibility = Visibility.PRIVATE)
VcnManagementService(@NonNull Context context, @NonNull Dependencies deps) { 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"); mDeps = requireNonNull(deps, "Missing dependencies");
mLooper = mDeps.getLooper(); mLooper = mDeps.getLooper();

3
services/core/java/com/android/server/VpnManagerService.java
View File

@@ -80,6 +80,7 @@ import java.util.List;
*/ */
public class VpnManagerService extends IVpnManager.Stub { public class VpnManagerService extends IVpnManager.Stub {
private static final String TAG = VpnManagerService.class.getSimpleName(); private static final String TAG = VpnManagerService.class.getSimpleName();
private static final String CONTEXT_ATTRIBUTION_TAG = "VPN_MANAGER";
@VisibleForTesting @VisibleForTesting
protected final HandlerThread mHandlerThread; protected final HandlerThread mHandlerThread;
@@ -157,7 +158,7 @@ public class VpnManagerService extends IVpnManager.Stub {
} }
public VpnManagerService(Context context, Dependencies deps) { public VpnManagerService(Context context, Dependencies deps) {
mContext = context; mContext = context.createAttributionContext(CONTEXT_ATTRIBUTION_TAG);
mDeps = deps; mDeps = deps;
mHandlerThread = mDeps.makeHandlerThread(); mHandlerThread = mDeps.makeHandlerThread();
mHandlerThread.start(); mHandlerThread.start();