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

Revert "Add attribution tags for VCN and VPN"

Browse Source 
This reverts commit 694b187597.

Reason for revert: <Break VpnManagerServiceTest. See b/286161960>

Change-Id: I4665c257c3cca28f0f657ba0f653ba2068f0d5e2
This commit is contained in:
Chiachang Wang
2023-06-07 08:46:51 +00:00
committed by Gerrit Code Review
parent 694b187597
commit 85029a4e5f
2 changed files with 2 additions and 7 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,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();

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

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