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

Commit 547f9b6e authored by Rhed Jao's avatar Rhed Jao Committed by Android (Google) Code Review
Browse files

Merge "Fix side channel package info disclosure in updateStatusIconAsync api"

parents 85a96259 c0cdadc3

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

+6 −3
Original line number Diff line number Diff line
@@ -2963,9 +2963,12 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
                    try {

                        // Use PackageManager to load label

                        final PackageManager packageManager = mContext.getPackageManager();

                        contentDescription = packageManager.getApplicationLabel(

                                mIPackageManager.getApplicationInfo(packageName, 0,

                                        mSettings.getCurrentUserId()));

                        final ApplicationInfo applicationInfo = mIPackageManager

                                .getApplicationInfo(packageName, 0, mSettings.getCurrentUserId());

                        if (applicationInfo != null) {

                            contentDescription = packageManager

                                    .getApplicationLabel(applicationInfo);

                        }

                    } catch (RemoteException e) {

                        /* ignore */

                    }