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

Commit b8a33125 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android (Google) Code Review
Browse files

Merge "Partially revert commit ff5659fb."

parents b23cd8ec e714927b

core/java/android/content/pm/PackageParser.java

+6 −6
Original line number Diff line number Diff line
@@ -2747,15 +2747,15 @@ public class PackageParser { 
        String cls = clsSeq.toString();

        char c = cls.charAt(0);

        if (c == '.') {

            return pkg + cls;

            return (pkg + cls).intern();

        }

        if (cls.indexOf('.') < 0) {

            StringBuilder b = new StringBuilder(pkg);

            b.append('.');

            b.append(cls);

            return b.toString();

            return b.toString().intern();

        }

        return cls;

        return cls.intern();

    }



    private static String buildCompoundName(String pkg,
@@ -2775,7 +2775,7 @@ public class PackageParser { 
                        + pkg + ": " + nameError;

                return null;

            }

            return pkg + proc;

            return (pkg + proc).intern();

        }

        String nameError = validateName(proc, true, false);

        if (nameError != null && !"system".equals(proc)) {
@@ -2783,7 +2783,7 @@ public class PackageParser { 
                    + pkg + ": " + nameError;

            return null;

        }

        return proc;

        return proc.intern();

    }



    private static String buildProcessName(String pkg, String defProc,
@@ -5101,7 +5101,7 @@ public class PackageParser { 
            if (v != null) {

                if (v.type == TypedValue.TYPE_STRING) {

                    CharSequence cs = v.coerceToString();

                    data.putString(name, cs != null ? cs.toString() : null);

                    data.putString(name, cs != null ? cs.toString().intern() : null);

                } else if (v.type == TypedValue.TYPE_INT_BOOLEAN) {

                    data.putBoolean(name, v.data != 0);

                } else if (v.type >= TypedValue.TYPE_FIRST_INT