Fix COPE admin constraint bug

Rubin Xu · Rubin Xu · commit c6ccd00a133e · 2020-02-28T14:57:32.000Z
TestDPC is only a COPE PO if the device is in COPE mode plus
TestDPC itself is PO.

Bug: 150121247
Test: manual
Change-Id: I7c6469a7b4eb2be53be4f0928412374a0422104a
diff --git a/app/src/main/java/com/afwsamples/testdpc/common/preference/DpcPreferenceHelper.java b/app/src/main/java/com/afwsamples/testdpc/common/preference/DpcPreferenceHelper.java
@@ -264,11 +264,12 @@ private int getCurrentAdmin() {
         } catch (ReflectionIsTemporaryException e) {
             orgOwned = false;
         }
-        if (orgOwned) {
-            return ADMIN_ORG_OWNED_PROFILE_OWNER;
-        }
         if (dpm.isProfileOwnerApp(packageName)) {
-            return ADMIN_PROFILE_OWNER;
+            if (orgOwned) {
+                return ADMIN_ORG_OWNED_PROFILE_OWNER;
+            } else {
+                return ADMIN_PROFILE_OWNER;
+            }
         }
         return ADMIN_NONE;
     }

Original file line number	Diff line number	Diff line change
`@@ -264,11 +264,12 @@ private int getCurrentAdmin() {`
`264`	`264`	`} catch (ReflectionIsTemporaryException e) {`
`265`	`265`	`orgOwned = false;`
`266`	`266`	`}`
`267`		`- if (orgOwned) {`
`268`		`- return ADMIN_ORG_OWNED_PROFILE_OWNER;`
`269`		`- }`
`270`	`267`	`if (dpm.isProfileOwnerApp(packageName)) {`
`271`		`- return ADMIN_PROFILE_OWNER;`
	`268`	`+ if (orgOwned) {`
	`269`	`+ return ADMIN_ORG_OWNED_PROFILE_OWNER;`
	`270`	`+ } else {`
	`271`	`+ return ADMIN_PROFILE_OWNER;`
	`272`	`+ }`
`272`	`273`	`}`
`273`	`274`	`return ADMIN_NONE;`
`274`	`275`	`}`