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

Commit bd2f531a authored by Suchi Amalapurapu's avatar Suchi Amalapurapu Committed by Android (Google) Code Review
Browse files

Merge "Fix StringIndexOutOfBoundsException in PackageManagerService"

parents d425a45f 5fd5bfe9

services/java/com/android/server/PackageManagerService.java

+5 −10
Original line number Diff line number Diff line
@@ -4369,18 +4369,13 @@ class PackageManagerService extends IPackageManager.Stub { 
        String idxStr = "";

        int idx = 1;

        if (oldCodePath != null) {

            int eidx = -1;

            if (suffix != null) {

                eidx = oldCodePath.indexOf(suffix);

            String subStr = oldCodePath;

            if (subStr.startsWith(prefix)) {

                subStr = subStr.substring(prefix.length());

            }

            if (eidx == -1) {

                eidx = oldCodePath.length();

            }

            int sidx = oldCodePath.indexOf(prefix);

            if (sidx == -1) {

                sidx = 0;

            if (subStr.endsWith(suffix)) {

                subStr = subStr.substring(0, subStr.length() - suffix.length());

            }

            String subStr = oldCodePath.substring(sidx + prefix.length(), eidx);

            if (subStr != null) {

                if (subStr.startsWith("-")) {

                    subStr = subStr.substring(1);