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

Commit ff34fc2b authored by Dan Egnor's avatar Dan Egnor Committed by Android (Google) Code Review
Browse files

Merge "Fix rare NPE in DropBoxManagerService"

parents b9e1ed2b f283e362

services/java/com/android/server/DropBoxManagerService.java

+3 −1
Original line number Diff line number Diff line
@@ -603,7 +603,9 @@ public final class DropBoxManagerService extends IDropBoxManagerService.Stub { 
            for (EntryFile late : future) {

                mAllFiles.blocks -= late.blocks;

                FileList tagFiles = mFilesByTag.get(late.tag);

                if (tagFiles.contents.remove(late)) tagFiles.blocks -= late.blocks;

                if (tagFiles != null && tagFiles.contents.remove(late)) {

                    tagFiles.blocks -= late.blocks;

                }

                if ((late.flags & DropBoxManager.IS_EMPTY) == 0) {

                    enrollEntry(new EntryFile(

                            late.file, mDropBoxDir, late.tag, t++, late.flags, mBlockSize));