commit c7aa0be40fba631117882fa7cc380ea9394f372f
author Beatrice Marchegiani <beatricemarch@google.com> Mon Jul 08 21:31:41 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 08 21:31:41 2024 +0000
tree de4702236f3dd53eb36bbd4280689e3a759c88b9
parent 177af6b61a94ee76fc8c5a059d592c2eda2af96e
parent a8cac82ccdd9efdd88a62133e4eec9570d50b7f0

Merge "Fix NPE when reading the allowlist" into main

services/backup/java/com/android/server/backup/utils/TarBackupReader.java

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)