Snap for 6624498 from c5b0d7e86a6694a666b6df0f321e65f48c7bc2ec to ub-testdpc-rvc-release

android-build-team Robot · android-build-team Robot · commit 341e119f0688 · 2020-06-24T17:15:04.000Z
Change-Id: Ifb7aa93ecfd75832b1e88eb4de61bba99f0378d5
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,7 +9,7 @@ ext {
     // exactly 1 digit
     versionMinor = 0
     // exactly 2 digits
-    versionBuild = 00
+    versionBuild = 01
 }
 
 android {
diff --git a/app/src/main/java/com/afwsamples/testdpc/policy/PolicyManagementFragment.java b/app/src/main/java/com/afwsamples/testdpc/policy/PolicyManagementFragment.java
@@ -2527,8 +2527,11 @@ private void reloadSetAutoTimeRequiredUi() {
 
     @TargetApi(Util.R_VERSION_CODE)
     private void reloadSetAutoTimeUi() {
-        boolean isOrgOwned = Util.SDK_INT >= VERSION_CODES.R &&
-                mDevicePolicyManager.isOrganizationOwnedDeviceWithManagedProfile();
+        if (Util.SDK_INT < VERSION_CODES.R) {
+            return;
+        }
+        boolean isOrgOwned =
+            mDevicePolicyManager.isOrganizationOwnedDeviceWithManagedProfile();
 
         if (mDevicePolicyManager.isDeviceOwnerApp(mPackageName)
                 || (mDevicePolicyManager.isProfileOwnerApp(mPackageName)
@@ -2540,8 +2543,11 @@ private void reloadSetAutoTimeUi() {
 
     @TargetApi(Util.R_VERSION_CODE)
     private void reloadSetAutoTimeZoneUi() {
-        boolean isOrgOwned = Util.SDK_INT >= VERSION_CODES.R &&
-                mDevicePolicyManager.isOrganizationOwnedDeviceWithManagedProfile();
+        if (Util.SDK_INT < VERSION_CODES.R) {
+            return;
+        }
+        boolean isOrgOwned =
+            mDevicePolicyManager.isOrganizationOwnedDeviceWithManagedProfile();
 
         if (mDevicePolicyManager.isDeviceOwnerApp(mPackageName)
                 || (mDevicePolicyManager.isProfileOwnerApp(mPackageName)

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ ext {`
`9`	`9`	`// exactly 1 digit`
`10`	`10`	`versionMinor = 0`
`11`	`11`	`// exactly 2 digits`
`12`		`- versionBuild = 00`
	`12`	`+ versionBuild = 01`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`android {`