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

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

Merge change 6960 

* changes:
  Don't NPE if a restore session is requested for an invalid transport
parents 56e7c2d6 43383045

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -1490,7 +1490,9 @@ class BackupManagerService extends IBackupManager.Stub { 




            try {

            try {

            synchronized(this) {

            synchronized(this) {

                if (mRestoreSets == null) {

                if (mRestoreTransport == null) {

                    Log.w(TAG, "Null transport getting restore sets");

                } else if (mRestoreSets == null) { // valid transport; do the one-time fetch

                    mRestoreSets = mRestoreTransport.getAvailableRestoreSets();

                    mRestoreSets = mRestoreTransport.getAvailableRestoreSets();

                }

                }

                return mRestoreSets;

                return mRestoreSets;