resolve merge conflicts of d76a7df to stage-aosp-master

Change-Id: Id29617452a102dfcd3111ba21f335ba75c7cd96c

1 files changed, 1 insertions, 2 deletions

diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java
index a23c6322d..ac3d8bf79 100644
--- a/service/java/com/android/server/wifi/WifiServiceImpl.java
+++ b/service/java/com/android/server/wifi/WifiServiceImpl.java
@@ -339,11 +339,10 @@ public class WifiServiceImpl extends IWifiManager.Stub {
                 new WifiStateMachineHandler(wifiServiceHandlerThread.getLooper());
         mWifiController = mWifiInjector.getWifiController();
         mWifiBackupRestore = mWifiInjector.getWifiBackupRestore();
-        mWifiPermissionsUtil = mWifiInjector.getWifiPermissionsUtil();
-
         mPermissionReviewRequired = Build.PERMISSIONS_REVIEW_REQUIRED
                 || context.getResources().getBoolean(
                 com.android.internal.R.bool.config_permissionReviewRequired);
+        mWifiPermissionsUtil = mWifiInjector.getWifiPermissionsUtil();
         mPasspointManager = mWifiInjector.getPasspointManager();
 
         enableVerboseLoggingInternal(getVerboseLoggingLevel());