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

Commit 0f097ac0 authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Android (Google) Code Review
Browse files

Merge "NPE for ArchiveState." into main

parents 2845390e 3750824d

services/core/java/com/android/server/pm/PackageSetting.java

+3 −0
Original line number Diff line number Diff line
@@ -1118,6 +1118,9 @@ public class PackageSetting extends SettingBase implements PackageStateInternal 
    }



    private static void writeArchiveState(ProtoOutputStream proto, ArchiveState archiveState) {

        if (archiveState == null) {

            return;

        }

        long archiveStateToken = proto.start(PackageProto.UserInfoProto.ARCHIVE_STATE);

        for (ArchiveState.ArchiveActivityInfo activityInfo : archiveState.getActivityInfos()) {

            long activityInfoToken = proto.start(