Working/release/21.1.0 to release/21.1.0

changelog.txt

@@ -1,5 +1,8 @@
 vNext
 ----------
+
+Version 21.1.0
+----------
 - [PATCH] Allow generating wrapping key without PURPOSE_WRAP_KEY with Flight (#2633))
 - [MINOR] Adding a state parameter to prevent phish attacks, in “switch_browser” flow. (#2631)
 - [MINOR] Move camera logic to CameraPermissionRequestHandler and add SdmQrPinManager (#2630)

common/build.gradle

@@ -31,7 +31,7 @@ codeCoverageReport {
 
 // In dev, we want to keep the dependencies(common4j, broker4j, common) to 1.0.+ to be able to be consumed by daily dev pipeline.
 // In release/*, we change these to specific versions being consumed.
-def common4jVersion = "1.0.+"
+def common4jVersion = "21.1.0"
 if (project.hasProperty("distCommon4jVersion") && project.distCommon4jVersion != '') {
     common4jVersion = project.distCommon4jVersion
 }

common4j/src/main/com/microsoft/identity/common/java/flighting/CommonFlight.java

@@ -109,7 +109,7 @@ public enum CommonFlight implements IFlightConfig {
     /**
      * Flight to enable adding x-client-MN and x-client-WPAvailable extra query parameters
      */
-    ENABLE_AM_API_WORKPROFILE_EXTRA_QUERY_PARAMETERS("EnableAmApiWorkProfileExtraQueryParameters", false),
+    ENABLE_AM_API_WORKPROFILE_EXTRA_QUERY_PARAMETERS("EnableAmApiWorkProfileExtraQueryParameters", true),
 
     /** Flight to enable the new key generation without PURPOSE_WRAP_KEY. Default is true.
      * This is applicable for API >= 23

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

@@ -79,7 +79,7 @@ public static void clearDeviceMetadata(){
     }
 
     @GuardedBy("sLock")
-    public static void setIsInPersonalProfileButClouddpcWorkProfileAvailable(final boolean isWorkProfileAvailable) {
+    public static void setIsInPersonalProfileButClouddpcWorkProfileAvailable(final Boolean isWorkProfileAvailable) {
         sLock.writeLock().lock();
         try {
             sIsInPersonalProfileButClouddpcWorkProfileAvailable = isWorkProfileAvailable;
@@ -89,7 +89,7 @@ public static void setIsInPersonalProfileButClouddpcWorkProfileAvailable(final b
     }
 
     @GuardedBy("sLock")
-    public static boolean isInPersonalProfileButClouddpcWorkProfileAvailable() {
+    public static Boolean isInPersonalProfileButClouddpcWorkProfileAvailable() {
         sLock.readLock().lock();
         try {
             return sIsInPersonalProfileButClouddpcWorkProfileAvailable;

common4j/src/test/com/microsoft/identity/common/java/platform/DeviceTest.java

@@ -45,6 +45,7 @@ public class DeviceTest {
     @After
     public void tearDown() {
         Device.clearDeviceMetadata();
+        Device.setIsInPersonalProfileButClouddpcWorkProfileAvailable(null);
     }
 
     @Test
@@ -135,5 +136,19 @@ public void testGetAllMetadata(){
                 MockDeviceMetadata.TEST_OS_DRS;
         Assert.assertEquals(expectedResult, deviceMetadata.getAllMetadata());
     }
+
+    @Test
+    public void testGetWorkProfileField(){
+        Assert.assertNull(Device.isInPersonalProfileButClouddpcWorkProfileAvailable());
+
+        Device.setIsInPersonalProfileButClouddpcWorkProfileAvailable(false);
+        Assert.assertFalse(Device.isInPersonalProfileButClouddpcWorkProfileAvailable());
+
+        Device.setIsInPersonalProfileButClouddpcWorkProfileAvailable(true);
+        Assert.assertTrue(Device.isInPersonalProfileButClouddpcWorkProfileAvailable());
+
+        Device.setIsInPersonalProfileButClouddpcWorkProfileAvailable(null);
+        Assert.assertNull(Device.isInPersonalProfileButClouddpcWorkProfileAvailable());
+    }
 }
 

common4j/versioning/version.properties

@@ -1,4 +1,4 @@
 #Wed May 12 20:08:39 UTC 2021
-versionName=21.0.0
+versionName=21.1.0
 versionCode=1
 latestPatchVersion=227

versioning/version.properties

@@ -1,4 +1,4 @@
 #Tue Apr 06 22:55:08 UTC 2021
-versionName=21.0.0
+versionName=21.1.0
 versionCode=1
 latestPatchVersion=234