diff options
| author | Artem Iglikov <artikz@google.com> | 2017-04-21 09:50:56 +0100 |
|---|---|---|
| committer | Anton Philippov <philippov@google.com> | 2017-04-21 10:45:21 +0000 |
| commit | e42c8416b0262e4fcda8c03428194a6a0b699d00 (patch) | |
| tree | d48d3f4f65a3867cfebb858ed29b0b27b6268be5 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 4b76d33968511c2dd56b25940115dcc823afedc8 (diff) | |
[DO NOT MERGE] 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
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions