diff options
| author | 2018-04-12 10:38:23 +0000 | |
|---|---|---|
| committer | 2018-04-12 10:38:23 +0000 | |
| commit | b30a1b0668fa7c35c48a140fe08c8aa0ae68a1c1 (patch) | |
| tree | aecfb6867f8bb5524c08028b81e043cb3bf55231 | |
| parent | 773791a94c7598f4154bf0f6b4f35f529ac49a90 (diff) | |
| parent | cfa5a82f82a5b4aeb6ca3ca6ca7f9af60ac62405 (diff) | |
Merge "Fix [kv-4] PerformBackupTask possible NPE/Wrong package report." into pi-dev
| -rw-r--r-- | services/backup/java/com/android/server/backup/internal/PerformBackupTask.java | 2 | ||||
| -rw-r--r-- | services/robotests/src/com/android/server/backup/PerformBackupTaskTest.java | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/services/backup/java/com/android/server/backup/internal/PerformBackupTask.java b/services/backup/java/com/android/server/backup/internal/PerformBackupTask.java index ac605b1ddd69..90baea0338e5 100644 --- a/services/backup/java/com/android/server/backup/internal/PerformBackupTask.java +++ b/services/backup/java/com/android/server/backup/internal/PerformBackupTask.java @@ -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 diff --git a/services/robotests/src/com/android/server/backup/PerformBackupTaskTest.java b/services/robotests/src/com/android/server/backup/PerformBackupTaskTest.java index fa41220dc44c..949c504d64dc 100644 --- a/services/robotests/src/com/android/server/backup/PerformBackupTaskTest.java +++ b/services/robotests/src/com/android/server/backup/PerformBackupTaskTest.java @@ -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() |