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

Commit ea84a555 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change Idfa47b56 

* changes:
  Don't crash the system process when a backup transport unregisters
parents 1905530b dfa47b56

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

+12 −2
Original line number Diff line number Diff line
@@ -497,11 +497,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.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