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

Merge "Fix for bmgr whitelist"

Browse Source
This commit is contained in:
Shreyas Basarge
2017-02-10 11:58:26 +00:00
committed by Android (Google) Code Review
parent c4e4491735 bf2ec2c5d7
commit ee1f9b26a8
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/backup/java/com/android/server/backup/BackupManagerService.java
View File

@@ -9577,7 +9577,14 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF
public String[] getTransportWhitelist() {
// No permission check, intentionally.
return mTransportManager.getTransportWhitelist().toArray(new String[0]);
Set<ComponentName> whitelistedComponents = mTransportManager.getTransportWhitelist();
String[] whitelistedTransports = new String[whitelistedComponents.size()];
int i = 0;
for (ComponentName component : whitelistedComponents) {
whitelistedTransports[i] = component.flattenToShortString();
i++;
}
return whitelistedTransports;
}
// Select which transport to use for the next backup operation.

3
services/backup/java/com/android/server/backup/TransportManager.java
View File

@@ -31,6 +31,7 @@ import android.os.IBinder;
import android.os.RemoteException;
import android.os.UserHandle;
import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.EventLog;
import android.util.Log;
import android.util.Slog;
@@ -84,7 +85,7 @@ class TransportManager {
TransportBoundListener listener) {
mContext = context;
mPackageManager = context.getPackageManager();
mTransportWhitelist = whitelist;
mTransportWhitelist = (whitelist != null) ? whitelist : new ArraySet<>();
mCurrentTransportName = defaultTransport;
mTransportBoundListener = listener;
}