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

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

Grant adb the BACKUP permission 

This also means we should no longer do explicit calling-identity fiddling in
dump(), relying instead on the usual permission enforcement mechanism to handle
things.
parent 334a6774

data/etc/platform.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -133,6 +133,7 @@ 
    <assign-permission name="android.permission.READ_FRAME_BUFFER" uid="shell" />

    <assign-permission name="android.permission.READ_FRAME_BUFFER" uid="shell" />

    <assign-permission name="android.permission.DEVICE_POWER" uid="shell" />

    <assign-permission name="android.permission.DEVICE_POWER" uid="shell" />

    <assign-permission name="android.permission.INSTALL_LOCATION_PROVIDER" uid="shell" />

    <assign-permission name="android.permission.INSTALL_LOCATION_PROVIDER" uid="shell" />

    <assign-permission name="android.permission.BACKUP" uid="shell" />





    <assign-permission name="android.permission.MODIFY_AUDIO_SETTINGS" uid="media" />

    <assign-permission name="android.permission.MODIFY_AUDIO_SETTINGS" uid="media" />

    <assign-permission name="android.permission.ACCESS_DRM" uid="media" />

    <assign-permission name="android.permission.ACCESS_DRM" uid="media" />

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

+0 −4
Original line number Original line Diff line number Diff line
@@ -1548,8 +1548,6 @@ class BackupManagerService extends IBackupManager.Stub { 
    @Override

    @Override

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

    public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        synchronized (mQueueLock) {

        synchronized (mQueueLock) {

            long oldId = Binder.clearCallingIdentity();



            pw.println("Backup Manager is " + (mEnabled ? "enabled" : "disabled")

            pw.println("Backup Manager is " + (mEnabled ? "enabled" : "disabled")

                    + " / " + (!mProvisioned ? "not " : "") + "provisioned");

                    + " / " + (!mProvisioned ? "not " : "") + "provisioned");

            pw.println("Available transports:");

            pw.println("Available transports:");
@@ -1572,8 +1570,6 @@ class BackupManagerService extends IBackupManager.Stub { 
            for (BackupRequest req : mPendingBackups.values()) {

            for (BackupRequest req : mPendingBackups.values()) {

                pw.println("    " + req);

                pw.println("    " + req);

            }

            }



            Binder.restoreCallingIdentity(oldId);

        }

        }

    }

    }

}
 
}