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

Commit fee42b3a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "LatinIME: Fix Implicit PendingIntent Vulnerability" into main am: 1b3568f9 

Original change: https://android-review.googlesource.com/c/platform/packages/inputmethods/LatinIME/+/3019664



Change-Id: I47f2c0609e86e24675da39477e995709cc34a3f9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 97cb6d0b 1b3568f9

java/src/com/android/inputmethod/dictionarypack/DictionaryService.java

+7 −1
Original line number Diff line number Diff line
@@ -229,8 +229,14 @@ public final class DictionaryService extends Service { 
        final long now = System.currentTimeMillis();

        final long alarmTime = now + new Random().nextInt(MAX_ALARM_DELAY_MILLIS);

        final Intent updateIntent = new Intent(DictionaryPackConstants.UPDATE_NOW_INTENT_ACTION);

        // Set the package name to ensure the PendingIntent is only delivered to trusted components

        updateIntent.setPackage(context.getPackageName());

        int pendingIntentFlags = PendingIntent.FLAG_CANCEL_CURRENT;

        if (android.os.Build.VERSION.SDK_INT >= 23) {

            pendingIntentFlags |= PendingIntent.FLAG_IMMUTABLE;

        }

        final PendingIntent pendingIntent = PendingIntent.getBroadcast(context, 0,

                updateIntent, PendingIntent.FLAG_CANCEL_CURRENT);

                updateIntent, pendingIntentFlags);



        // We set the alarm in the type that doesn't forcefully wake the device

        // from sleep, but fires the next time the device actually wakes for any