refactor

Author: fadidurah

common/src/main/java/com/microsoft/identity/common/components/AndroidPlatformComponentsFactory.java

@@ -38,6 +38,8 @@
 import com.microsoft.identity.common.internal.ui.browser.AndroidBrowserSelector;
 import com.microsoft.identity.common.internal.util.WorkProfileUtil;
 import com.microsoft.identity.common.java.WarningType;
+import com.microsoft.identity.common.java.flighting.CommonFlight;
+import com.microsoft.identity.common.java.flighting.CommonFlightsManager;
 import com.microsoft.identity.common.java.interfaces.IPlatformComponents;
 import com.microsoft.identity.common.java.interfaces.PlatformComponents;
 import com.microsoft.identity.common.java.net.DefaultHttpClientWrapper;
@@ -70,8 +72,10 @@ public static synchronized void initializeGlobalStates(@NonNull final Context co
             Device.setDeviceMetadata(new AndroidDeviceMetadata());
 
             // Denotes whether or not request is from personal profile but device has a Work Profile Available
-            Device.setIsInPersonalProfileButClouddpcWorkProfileAvailable(
-                    WorkProfileUtil.checkIfIsInPersonalProfileButClouddpcWorkProfileAvailable(context));
+            if (CommonFlightsManager.INSTANCE.getFlightsProvider().isFlightEnabled(CommonFlight.ENABLE_AM_API_WORKPROFILE_EXTRA_QUERY_PARAMETERS)) {
+                Device.setIsInPersonalProfileButClouddpcWorkProfileAvailable(
+                        WorkProfileUtil.checkIfIsInPersonalProfileButClouddpcWorkProfileAvailable(context));
+            }
             Logger.setAndroidLogger();
 
             final File cacheDir = context.getCacheDir();

common4j/src/main/com/microsoft/identity/common/java/platform/Device.java

@@ -53,7 +53,7 @@ public class Device {
     /**
      * Denotes whether or not request is from personal profile but device has a Work Profile Available
      */
-    private static boolean sIsInPersonalProfileButClouddpcWorkProfileAvailable = false;
+    private static Boolean sIsInPersonalProfileButClouddpcWorkProfileAvailable = null;
 
     private static final ReentrantReadWriteLock sLock = new ReentrantReadWriteLock();