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

Commit a5d26a36 authored by Hai Zhang's avatar Hai Zhang Committed by Anis Assi
Browse files

DO NOT MERGE Ensure package names read from config are system packages. 

Bug: 145981139
Test: manually tested ensureSystemPackageName() returns null for non-system app
Change-Id: I1d23910cbd282f6702785c9dfb059d7be6b0e895
(cherry picked from commit 6a562472)
(cherry picked from commit 584d73a0)
parent a0a76f69

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

+23 −1
Original line number Diff line number Diff line
@@ -20642,7 +20642,29 @@ Slog.v(TAG, ":: stepped forward, applying functor at tag " + parser.getName()); 














    @Override















    public String getSystemTextClassifierPackageName() {













        return mContext.getString(R.string.config_defaultTextClassifierPackage);













        return ensureSystemPackageName(mContext.getString(













                R.string.config_defaultTextClassifierPackage));













    }

























    @Nullable













    private String ensureSystemPackageName(@Nullable String packageName) {













        if (packageName == null) {













            return null;













        }













        long token = Binder.clearCallingIdentity();













        try {













            if (getPackageInfo(packageName, MATCH_FACTORY_ONLY, UserHandle.USER_SYSTEM) == null) {













                PackageInfo packageInfo = getPackageInfo(packageName, 0, UserHandle.USER_SYSTEM);













                if (packageInfo != null) {













                    EventLog.writeEvent(0x534e4554, "145981139", packageInfo.applicationInfo.uid,













                            "");













                }













                return null;













            }













        } finally {













            Binder.restoreCallingIdentity(token);













        }













        return packageName;















    }





























    @Override