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

Commit bf2ec2c5 authored by Shreyas Basarge's avatar Shreyas Basarge
Browse files

Fix for bmgr whitelist 

The bmgr whitelist command was broken
after the selectTransport api cl. This
cl fixes it.

Bug: 34953486
Test: Verify that adb shell bmgr whitelist prints all whitelisted
transports
Change-Id: I3c3275258a45a035a0ca9404d1016ca5663cceaf
parent b01cac7c

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

+8 −1
Original line number Original line Diff line number Diff line
@@ -9573,7 +9573,14 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF 




    public String[] getTransportWhitelist() {

    public String[] getTransportWhitelist() {

        // No permission check, intentionally.

        // 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.

    // Select which transport to use for the next backup operation.

services/backup/java/com/android/server/backup/TransportManager.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ import android.os.IBinder; 
import android.os.RemoteException;

import android.os.RemoteException;

import android.os.UserHandle;

import android.os.UserHandle;

import android.util.ArrayMap;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.EventLog;

import android.util.EventLog;

import android.util.Log;

import android.util.Log;

import android.util.Slog;

import android.util.Slog;
@@ -84,7 +85,7 @@ class TransportManager { 
            TransportBoundListener listener) {

            TransportBoundListener listener) {

        mContext = context;

        mContext = context;

        mPackageManager = context.getPackageManager();

        mPackageManager = context.getPackageManager();

        mTransportWhitelist = whitelist;

        mTransportWhitelist = (whitelist != null) ? whitelist : new ArraySet<>();

        mCurrentTransportName = defaultTransport;

        mCurrentTransportName = defaultTransport;

        mTransportBoundListener = listener;

        mTransportBoundListener = listener;

    }

    }