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

Commit cfc04c80 authored by Henry Liu's avatar Henry Liu Committed by android-build-merger
Browse files

Merge "Fix [kv-4] PerformBackupTask possible NPE/Wrong package report." into pi-dev 

am: b30a1b06

Change-Id: If6b49d2087a1b007a0befa6b9820cf9d5957eb29
parents 26bedfe4 b30a1b06

services/backup/java/com/android/server/backup/internal/PerformBackupTask.java

+1 −1
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ public class PerformBackupTask implements BackupRestoreTask { 
                    // we're otherwise fine.  Just drop it and go on to the next as usual.

                    mStatus = BackupTransport.TRANSPORT_OK;

                    BackupObserverUtils

                            .sendBackupOnPackageResult(mObserver, mCurrentPackage.packageName,

                            .sendBackupOnPackageResult(mObserver, request.packageName,

                                    BackupManager.ERROR_PACKAGE_NOT_FOUND);

                } else {

                    // Transport-level failure means we reenqueue everything

services/robotests/src/com/android/server/backup/PerformBackupTaskTest.java

+0 −3
Original line number Diff line number Diff line
@@ -492,9 +492,6 @@ public class PerformBackupTaskTest { 
        verify(agentMock.agent).onQuotaExceeded(anyLong(), anyLong());

    }



    // TODO: Giving NPE at PerformBackupTask:524 because mCurrentPackage is null (PackageManager

    // rightfully threw NameNotFoundException). Remove @Ignore when fixed.

    @Ignore

    @Test

    public void testRunTask_whenAgentUnknown() throws Exception {

        // Not calling setUpAgent()