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

Commit ffe0a803 authored by Christopher Tate's avatar Christopher Tate
Browse files

Fix permission checks around setBackupEnabled() 

...by making sure to drop binder identity before writing our new
state to secure settings etc.

Bug 10506933

Change-Id: I00505cc5215c8fe5f30f2f35698b30645fe14c87
parent e6a01f37

services/java/com/android/server/BackupManagerService.java

+37 −31
Original line number Diff line number Diff line
@@ -5358,12 +5358,15 @@ class BackupManagerService extends IBackupManager.Stub { 
    }



    // Enable/disable the backup service

    @Override

    public void setBackupEnabled(boolean enable) {

        mContext.enforceCallingOrSelfPermission(android.Manifest.permission.BACKUP,

                "setBackupEnabled");



        Slog.i(TAG, "Backup enabled => " + enable);



        long oldId = Binder.clearCallingIdentity();

        try {

            boolean wasEnabled = mEnabled;

            synchronized (this) {

                Settings.Secure.putInt(mContext.getContentResolver(),
@@ -5400,6 +5403,9 @@ class BackupManagerService extends IBackupManager.Stub { 
                    }

                }

            }

        } finally {

            Binder.restoreCallingIdentity(oldId);

        }

    }



    // Enable/disable automatic restore of app data at install time