Skip to content

Cherrypick, change boolean to Boolean, Fixes AB#3261502 #2635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 1, 2025
Merged

Cherrypick, change boolean to Boolean, Fixes AB#3261502 #2635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb938fb
change to Boolean type
fadidurah May 1, 2025
348c1da
flight on by default
fadidurah May 1, 2025
8f75647
device test
fadidurah May 1, 2025
fe8f045
checks
fadidurah May 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common4j/src/main/com/microsoft/identity/common/java/flighting/CommonFlight.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions common4j/src/main/com/microsoft/identity/common/java/platform/Device.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
15 changes: 15 additions & 0 deletions common4j/src/test/com/microsoft/identity/common/java/platform/DeviceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ public class DeviceTest {
@After
public void tearDown() {
Device.clearDeviceMetadata();
Device.setIsInPersonalProfileButClouddpcWorkProfileAvailable(null);
}

@Test
Expand Down Expand Up @@ -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());
}
}