From ed2dfc9d68a8fa83659620fbe88312bc57dc5af5 Mon Sep 17 00:00:00 2001
From: Cody Kesting <ckesting@google.com>
Date: Mon, 1 Feb 2021 22:46:32 -0800
Subject: [PATCH] Fix field order for UnderlyingNetworkTracker.

Bug: 177364490
Test: atest FrameworksVcnTests
Change-Id: Ie1671925ab0427d47020673cca7c889bff8b6a8a
---
 .../java/com/android/server/vcn/UnderlyingNetworkTracker.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/vcn/UnderlyingNetworkTracker.java b/services/core/java/com/android/server/vcn/UnderlyingNetworkTracker.java
index 1de4bf794a5dd..b6ddd93af3b8a 100644
--- a/services/core/java/com/android/server/vcn/UnderlyingNetworkTracker.java
+++ b/services/core/java/com/android/server/vcn/UnderlyingNetworkTracker.java
@@ -54,6 +54,7 @@ public class UnderlyingNetworkTracker {
 
     @NonNull private final VcnContext mVcnContext;
     @NonNull private final ParcelUuid mSubscriptionGroup;
+    @NonNull private final Set<Integer> mRequiredUnderlyingNetworkCapabilities;
     @NonNull private final UnderlyingNetworkTrackerCallback mCb;
     @NonNull private final Dependencies mDeps;
     @NonNull private final Handler mHandler;
@@ -63,8 +64,6 @@ public class UnderlyingNetworkTracker {
     @NonNull private final NetworkCallback mWifiBringupCallback = new NetworkBringupCallback();
     @NonNull private final NetworkCallback mRouteSelectionCallback = new RouteSelectionCallback();
 
-    @NonNull private final Set<Integer> mRequiredUnderlyingNetworkCapabilities;
-
     @NonNull private TelephonySubscriptionSnapshot mLastSnapshot;
     private boolean mIsRunning = true;