Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7aa0be4 authored by Beatrice Marchegiani's avatar Beatrice Marchegiani Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE when reading the allowlist" into main

parents 177af6b6 a8cac82c

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

+2 −1
Original line number Diff line number Diff line
@@ -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)