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

Merge change 6305 into donut

Browse Source 
* changes:
  Fix up permissions for 'dumpsys backup'
This commit is contained in:
Android (Google) Code Review
2009-07-06 15:49:26 -07:00
parent da93c26a3d 34ebd0e1bb
commit 8d07c06846
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/BackupManagerService.java
View File

@@ -316,6 +316,7 @@ class BackupManagerService extends IBackupManager.Stub {
// Add a transport to our set of available backends // Add a transport to our set of available backends
private void registerTransport(String name, IBackupTransport transport) { private void registerTransport(String name, IBackupTransport transport) {
synchronized (mTransports) { synchronized (mTransports) {
if (DEBUG) Log.v(TAG, "Registering transport " + name + " = " + transport);
mTransports.put(name, transport); mTransports.put(name, transport);
} }
} }
@@ -1341,7 +1342,7 @@ class BackupManagerService extends IBackupManager.Stub {
// Report all known, available backup transports // Report all known, available backup transports
public String[] listAllTransports() { public String[] listAllTransports() {
mContext.enforceCallingPermission(android.Manifest.permission.BACKUP, "listAllTransports"); mContext.enforceCallingOrSelfPermission(android.Manifest.permission.BACKUP, "listAllTransports");
String[] list = null; String[] list = null;
ArrayList<String> known = new ArrayList<String>(); ArrayList<String> known = new ArrayList<String>();
@@ -1503,6 +1504,8 @@ 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"));
pw.println("Available transports:"); pw.println("Available transports:");
for (String t : listAllTransports()) { for (String t : listAllTransports()) {
@@ -1524,6 +1527,8 @@ class BackupManagerService extends IBackupManager.Stub {
for (BackupRequest req : mPendingBackups.values()) { for (BackupRequest req : mPendingBackups.values()) {
pw.println(" " + req); pw.println(" " + req);
} }
Binder.restoreCallingIdentity(oldId);
} }
} }
} }