From de83ab9fce4d02ddfde785e193bc787497d45138 Mon Sep 17 00:00:00 2001
From: Christopher Tate <ctate@android.com>
Date: Tue, 14 Jul 2009 15:38:07 -0700
Subject: [PATCH] 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.
---
 data/etc/platform.xml                                      | 1 +
 services/java/com/android/server/BackupManagerService.java | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/data/etc/platform.xml b/data/etc/platform.xml
index a3579c7b8d72a..0069fe1765da8 100644
--- a/data/etc/platform.xml
+++ b/data/etc/platform.xml
@@ -133,6 +133,7 @@
     <assign-permission name="android.permission.READ_FRAME_BUFFER" 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.BACKUP" uid="shell" />
 
     <assign-permission name="android.permission.MODIFY_AUDIO_SETTINGS" uid="media" />
     <assign-permission name="android.permission.ACCESS_DRM" uid="media" />
diff --git a/services/java/com/android/server/BackupManagerService.java b/services/java/com/android/server/BackupManagerService.java
index 69371b3312e31..20f0750bc8f8d 100644
--- a/services/java/com/android/server/BackupManagerService.java
+++ b/services/java/com/android/server/BackupManagerService.java
@@ -1548,8 +1548,6 @@ class BackupManagerService extends IBackupManager.Stub {
     @Override
     public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
         synchronized (mQueueLock) {
-            long oldId = Binder.clearCallingIdentity();
-
             pw.println("Backup Manager is " + (mEnabled ? "enabled" : "disabled")
                     + " / " + (!mProvisioned ? "not " : "") + "provisioned");
             pw.println("Available transports:");
@@ -1572,8 +1570,6 @@ class BackupManagerService extends IBackupManager.Stub {
             for (BackupRequest req : mPendingBackups.values()) {
                 pw.println("    " + req);
             }
-
-            Binder.restoreCallingIdentity(oldId);
         }
     }
 }