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

Commit 08229e81 authored by Zoltan Szatmary-Ban's avatar Zoltan Szatmary-Ban Committed by Android (Google) Code Review
Browse files

Merge "Shutdown backup manager service when device owner is set" into lmp-mr1-dev

parents 07334334 26ac6a6f

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

+13 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.app.admin.DeviceAdminReceiver; 
import android.app.admin.DevicePolicyManager;

import android.app.admin.DevicePolicyManagerInternal;

import android.app.admin.IDevicePolicyManager;

import android.app.backup.IBackupManager;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.ContentResolver;
@@ -3652,6 +3653,18 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                        "Trying to set device owner but device owner is already set.");

            }



            // Shutting down backup manager service permanently.

            long ident = Binder.clearCallingIdentity();

            try {

                IBackupManager ibm = IBackupManager.Stub.asInterface(

                        ServiceManager.getService(Context.BACKUP_SERVICE));

                ibm.setBackupServiceActive(UserHandle.USER_OWNER, false);

            } catch (RemoteException e) {

                throw new IllegalStateException("Failed deactivating backup service.", e);

            } finally {

                Binder.restoreCallingIdentity(ident);

            }



            if (mDeviceOwner == null) {

                // Device owner is not set and does not exist, set it.

                mDeviceOwner = DeviceOwner.createWithDeviceOwner(packageName, ownerName);