diff options
| author | 2024-07-08 11:08:14 +0000 | |
|---|---|---|
| committer | 2024-07-11 04:24:09 +0000 | |
| commit | cff690835753343ee3d2ca15e78ebf46a49bde89 (patch) | |
| tree | 97da663fcc6d518d59c1d99254e020c454622eaf /services/backup | |
| parent | 7fe57d25c892ad206b58c99c587fb28289830b80 (diff) | |
Fix NPE when reading the allowlist
Bug: 351750747
Test: atest -v TarBackupReaderTest, manual test
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a8cac82ccdd9efdd88a62133e4eec9570d50b7f0)
Merged-In: Icf4fe058e7d261c197e04ccad940595413bd4a99
Change-Id: Icf4fe058e7d261c197e04ccad940595413bd4a99
Diffstat (limited to 'services/backup')
| -rw-r--r-- | services/backup/java/com/android/server/backup/utils/TarBackupReader.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 4860a274cfa8..8abbe5666d58 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 @@ public class TarBackupReader { } 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) |