File tree Expand file tree Collapse file tree 3 files changed +18
-3
lines changed
main/com/microsoft/identity/common/java
test/com/microsoft/identity/common/java/platform Expand file tree Collapse file tree 3 files changed +18
-3
lines changed Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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 ;
Original file line number Diff line number Diff 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
You can’t perform that action at this time.
0 commit comments