Skip to content

Commit 6bc9599

Browse files
authored
Cherrypick, change boolean to Boolean, Fixes AB#3261502 (#2635)
Made a change to support work profile, but a refactor introduced possibility of null values for work profile is available field, which is causing exceptions in automation as boolean type cannot handle null value. Changing to Boolean. [AB#3261502](https://identitydivision.visualstudio.com/fac9d424-53d2-45c0-91b5-ef6ba7a6bf26/_workitems/edit/3261502)
1 parent de62fe8 commit 6bc9599

File tree

3 files changed

+18
-3
lines changed

3 files changed

+18
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public enum CommonFlight implements IFlightConfig {
109109
/**
110110
* Flight to enable adding x-client-MN and x-client-WPAvailable extra query parameters
111111
*/
112-
ENABLE_AM_API_WORKPROFILE_EXTRA_QUERY_PARAMETERS("EnableAmApiWorkProfileExtraQueryParameters", false),
112+
ENABLE_AM_API_WORKPROFILE_EXTRA_QUERY_PARAMETERS("EnableAmApiWorkProfileExtraQueryParameters", true),
113113

114114
/** Flight to enable the new key generation without PURPOSE_WRAP_KEY. Default is true.
115115
* This is applicable for API >= 23

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public static void clearDeviceMetadata(){
7979
}
8080

8181
@GuardedBy("sLock")
82-
public static void setIsInPersonalProfileButClouddpcWorkProfileAvailable(final boolean isWorkProfileAvailable) {
82+
public static void setIsInPersonalProfileButClouddpcWorkProfileAvailable(final Boolean isWorkProfileAvailable) {
8383
sLock.writeLock().lock();
8484
try {
8585
sIsInPersonalProfileButClouddpcWorkProfileAvailable = isWorkProfileAvailable;
@@ -89,7 +89,7 @@ public static void setIsInPersonalProfileButClouddpcWorkProfileAvailable(final b
8989
}
9090

9191
@GuardedBy("sLock")
92-
public static boolean isInPersonalProfileButClouddpcWorkProfileAvailable() {
92+
public static Boolean isInPersonalProfileButClouddpcWorkProfileAvailable() {
9393
sLock.readLock().lock();
9494
try {
9595
return sIsInPersonalProfileButClouddpcWorkProfileAvailable;

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ public class DeviceTest {
4545
@After
4646
public void tearDown() {
4747
Device.clearDeviceMetadata();
48+
Device.setIsInPersonalProfileButClouddpcWorkProfileAvailable(null);
4849
}
4950

5051
@Test
@@ -135,5 +136,19 @@ public void testGetAllMetadata(){
135136
MockDeviceMetadata.TEST_OS_DRS;
136137
Assert.assertEquals(expectedResult, deviceMetadata.getAllMetadata());
137138
}
139+
140+
@Test
141+
public void testGetWorkProfileField(){
142+
Assert.assertNull(Device.isInPersonalProfileButClouddpcWorkProfileAvailable());
143+
144+
Device.setIsInPersonalProfileButClouddpcWorkProfileAvailable(false);
145+
Assert.assertFalse(Device.isInPersonalProfileButClouddpcWorkProfileAvailable());
146+
147+
Device.setIsInPersonalProfileButClouddpcWorkProfileAvailable(true);
148+
Assert.assertTrue(Device.isInPersonalProfileButClouddpcWorkProfileAvailable());
149+
150+
Device.setIsInPersonalProfileButClouddpcWorkProfileAvailable(null);
151+
Assert.assertNull(Device.isInPersonalProfileButClouddpcWorkProfileAvailable());
152+
}
138153
}
139154

0 commit comments

Comments
 (0)