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

Commit 5ccf55eb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "IMMS: Make IMMS PendingIntents immutable" into qt-dev

parents b5c79e14 2b859826

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

+4 −2
Original line number Diff line number Diff line
@@ -1494,7 +1494,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 


        Intent intent = new Intent(ACTION_SHOW_INPUT_METHOD_PICKER)

                .setPackage(mContext.getPackageName());

        mImeSwitchPendingIntent = PendingIntent.getBroadcast(mContext, 0, intent, 0);

        mImeSwitchPendingIntent = PendingIntent.getBroadcast(mContext, 0, intent,

                PendingIntent.FLAG_IMMUTABLE);



        mShowOngoingImeSwitcherForPhones = false;
@@ -2186,7 +2187,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
        mCurIntent.putExtra(Intent.EXTRA_CLIENT_LABEL,

                com.android.internal.R.string.input_method_binding_label);

        mCurIntent.putExtra(Intent.EXTRA_CLIENT_INTENT, PendingIntent.getActivity(

                mContext, 0, new Intent(Settings.ACTION_INPUT_METHOD_SETTINGS), 0));

                mContext, 0, new Intent(Settings.ACTION_INPUT_METHOD_SETTINGS),

                PendingIntent.FLAG_IMMUTABLE));



        if (bindCurrentInputMethodServiceLocked(mCurIntent, this, IME_CONNECTION_BIND_FLAGS)) {

            mLastBindTime = SystemClock.uptimeMillis();