Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[DO NOT MERGE] Fix potential NPE in Trampoline.requestBackup().

Browse Source 
Before it was returning null in case the service was not initialized,
but as the method signature has int as the return type, this was boxed
and unboxed which would cause NPE.

Now it will return BackupManager.ERROR_BACKUP_NOT_ALLOWED instead.

This doesn't include fix for the test, because it's going to be
cherry-picked into oc-dev, which doesn't have the tests.

Test: manually ran unit tests

Bug: 37535747

Change-Id: I186cf812a4ec67be943b5c4334c82e9af5320b7a
This commit is contained in:
Artem Iglikov
2017-04-21 09:50:56 +01:00
committed by Anton Philippov
parent 4b76d33968
commit e42c8416b0
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/backup/java/com/android/server/backup/Trampoline.java
View File

@@ -16,6 +16,7 @@
package com.android.server.backup;
import android.app.backup.BackupManager;
import android.app.backup.IBackupManager;
import android.app.backup.IBackupObserver;
import android.app.backup.IBackupManagerMonitor;
@@ -361,7 +362,10 @@ public class Trampoline extends IBackupManager.Stub {
public int requestBackup(String[] packages, IBackupObserver observer,
IBackupManagerMonitor monitor, int flags) throws RemoteException {
BackupManagerService svc = mService;
return (svc != null) ? svc.requestBackup(packages, observer, monitor, flags) : null;
if (svc == null) {
return BackupManager.ERROR_BACKUP_NOT_ALLOWED;
}
return svc.requestBackup(packages, observer, monitor, flags);
}
@Override