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

Commit b8708c01 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #17329290: NPE during ContentProviderRecord.dump()" into lmp-dev

parents 0ae64a84 3133c401

services/core/java/com/android/server/am/ContentProviderRecord.java

+10 −2
Original line number Diff line number Diff line
@@ -166,8 +166,16 @@ final class ContentProviderRecord { 
        }

        if (full) {

            if (hasExternalProcessHandles()) {

                pw.print(prefix); pw.print("externals=");

                        pw.println(externalProcessTokenToHandle.size());

                pw.print(prefix); pw.print("externals:");

                if (externalProcessTokenToHandle != null) {

                    pw.print(" w/token=");

                    pw.print(externalProcessTokenToHandle.size());

                }

                if (externalProcessNoHandleCount > 0) {

                    pw.print(" notoken=");

                    pw.print(externalProcessNoHandleCount);

                }

                pw.println();

            }

        } else {

            if (connections.size() > 0 || externalProcessNoHandleCount > 0) {