Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of 792e051 to master

Browse Source 
Change-Id: I75e604639959df77ddf11bbb9805392e4141da23
This commit is contained in:
Vladislav Kuzkokov
2016-10-13 12:42:59 +02:00
parent 85730569b1 792e051ab8
commit 543befb7c2
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -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_TRUST_STORE_CHANGED.equals(action)) {
@@ -9357,16 +9351,13 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
return true;
}
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);
} catch (RemoteException e) {
throw new IllegalStateException("Failed requesting backup service state.", e);
try {
getActiveAdminForCallerLocked(admin, DeviceAdminInfo.USES_POLICY_DEVICE_OWNER);
IBackupManager ibm = mInjector.getIBackupManager();
return ibm != null && ibm.isBackupServiceActive(UserHandle.USER_SYSTEM);
} catch (RemoteException e) {
throw new IllegalStateException("Failed requesting backup service state.", e);
}
}
}