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

Commit 8db2afe9 authored by Oli Lan's avatar Oli Lan Committed by Automerger Merge Worker
Browse files

Merge "Fix potential NPE in isDefaultIme" into main am: 262d3602 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2884646



Change-Id: I710eb3dc878754c39e9fd804607a4fe3a0936a02
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 96d93215 262d3602

services/core/java/com/android/server/clipboard/ClipboardService.java

+5 −1
Original line number Diff line number Diff line
@@ -1344,7 +1344,11 @@ public class ClipboardService extends SystemService { 
        String defaultIme = Settings.Secure.getStringForUser(getContext().getContentResolver(),

                Settings.Secure.DEFAULT_INPUT_METHOD, userId);

        if (!TextUtils.isEmpty(defaultIme)) {

            final String imePkg = ComponentName.unflattenFromString(defaultIme).getPackageName();

            final ComponentName imeComponent = ComponentName.unflattenFromString(defaultIme);

            if (imeComponent == null) {

                return false;

            }

            final String imePkg = imeComponent.getPackageName();

            return imePkg.equals(packageName);

        }

        return false;