tree 00a74aae080645cf42b8ca4076a6b5180849c707
parent 6883b04f5f1cde27dc66d7ef12e1beac6db39b81
author Artem Iglikov <artikz@google.com> 1492764656 +0100
committer Artem Iglikov <artikz@google.com> 1492764829 +0100

Fix potential NPE in Trampoline.requestBackup().

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