Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 792e051a authored by Vladislav Kuzkokov's avatar Vladislav Kuzkokov Committed by android-build-merger
Browse files

Revert "Fix backup for users hit by erroneous backup disabling" am: 9f61d17e 

am: 98a145b5

Change-Id: I82ae89b2b0ebb5fefd44fec4f10184b6bb7123d3
parents 1e42c73f 98a145b5

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+6 −15
Original line number Diff line number Diff line
@@ -496,12 +496,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                    }

                });

            }

            // STOPSHIP: Remove this code once all dogfood devices are fixed. See b/31754835

            if (Intent.ACTION_BOOT_COMPLETED.equals(action) && !mOwners.hasDeviceOwner()

                    && !isBackupServiceEnabledInternal()) {

                setBackupServiceEnabledInternal(true);

                Slog.w(LOG_TAG, "Fix backup for device that is not in Device Owner mode.");

            }

            if (Intent.ACTION_USER_UNLOCKED.equals(action)

                    || Intent.ACTION_USER_STARTED.equals(action)

                    || KeyChain.ACTION_STORAGE_CHANGED.equals(action)) {
@@ -9327,10 +9321,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        }

        synchronized (this) {

            getActiveAdminForCallerLocked(admin, DeviceAdminInfo.USES_POLICY_DEVICE_OWNER);

            return isBackupServiceEnabledInternal();

        }

    }

    private boolean isBackupServiceEnabledInternal() {

            try {

                IBackupManager ibm = mInjector.getIBackupManager();

                return ibm != null && ibm.isBackupServiceActive(UserHandle.USER_SYSTEM);
@@ -9339,3 +9329,4 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            }

        }

    }

}