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

Commit 45159937 authored by Narayan Kamath's avatar Narayan Kamath Committed by android-build-merger
Browse files

am 1bafd01a: am 44a5a30a: Merge "Fix "pm list permissions" crash if resource string missing" 

automerge: 1cc57aba

* commit '1cc57aba':
  Fix "pm list permissions" crash if resource string missing
parents ea84327f 1cc57aba

cmds/pm/src/com/android/commands/pm/Pm.java

+4 −1
Original line number Diff line number Diff line
@@ -549,7 +549,10 @@ public final class Pm { 
        if (res != 0) {

            Resources r = getResources(pii);

            if (r != null) {

                try {

                    return r.getString(res);

                } catch (Resources.NotFoundException e) {

                }

            }

        }

        return null;