| commit | a8cac82ccdd9efdd88a62133e4eec9570d50b7f0 | [log] [tgz] |
|---|---|---|
| author | Beatrice Marchegiani <beatricemarch@google.com> | Mon Jul 08 11:08:14 2024 +0000 |
| committer | Beatrice Marchegiani <beatricemarch@google.com> | Mon Jul 08 14:33:06 2024 +0000 |
| tree | 647dbbb25b9383a62813f2c87d060454c98c1e42 | |
| parent | e1d1b025d7d0d87a3abce856c075c8ba0bed699f [diff] |
Fix NPE when reading the allowlist Bug: 351750747 Test: atest -v TarBackupReaderTest, manual test Flag: EXEMPT bugfix Change-Id: Icf4fe058e7d261c197e04ccad940595413bd4a99
diff --git a/services/backup/java/com/android/server/backup/utils/TarBackupReader.java b/services/backup/java/com/android/server/backup/utils/TarBackupReader.java index 4860a27..8abbe56 100644 --- a/services/backup/java/com/android/server/backup/utils/TarBackupReader.java +++ b/services/backup/java/com/android/server/backup/utils/TarBackupReader.java
@@ -792,10 +792,11 @@ } private String getVToUAllowlist(Context context, int userId) { - return Settings.Secure.getStringForUser( + String allowlist = Settings.Secure.getStringForUser( context.getContentResolver(), Settings.Secure.V_TO_U_RESTORE_ALLOWLIST, userId); + return (allowlist == null) ? "" : allowlist; } private static long extractRadix(byte[] data, int offset, int maxChars, int radix)