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

Commit ef7cf40b authored by Steve Kondik's avatar Steve Kondik
Browse files

Fix NPE when unregistering a backup transport.

parent 4e24ef61
Loading
Loading
Loading
Loading
+12 −2
Original line number Diff line number Diff line
@@ -513,11 +513,21 @@ class BackupManagerService extends IBackupManager.Stub {
        }
    }

    // Add a transport to our set of available backends
    // Add a transport to our set of available backends.  If 'transport' is null, this
    // is an unregistration, and the transport's entry is removed from our bookkeeping.
    private void registerTransport(String name, IBackupTransport transport) {
        synchronized (mTransports) {
            if (DEBUG) Log.v(TAG, "Registering transport " + name + " = " + transport);
            if (transport != null) {
                mTransports.put(name, transport);
            } else {
                mTransports.remove(name);
                if (mCurrentTransport != null && mCurrentTransport.equals(name)) {
                    mCurrentTransport = null;
                }
                // Nothing further to do in the unregistration case
                return;
            }
        }

        // If the init sentinel file exists, we need to be sure to perform the init