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

Commit b087ceea authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 40eade14: Merge from open-source master 

* commit '40eade14':
  Fix crash by "adb shell pm list permissions -f|-s"
parents 5561ecff 40eade14

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

+5 −3
Original line number Diff line number Diff line
@@ -341,10 +341,12 @@ public final class Pm { 
        if (nonLocalized != null) {

            return nonLocalized.toString();

        }

        if (res != 0) {

            Resources r = getResources(pii);

            if (r != null) {

                return r.getString(res);

            }

        }

        return null;

    }