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

Unverified Commit 00b85c29 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'android-15.0.0_r6' into staging/lineage-22.0_merge-android-15.0.0_r6 

Android 15.0.0 Release 6 (AP4A.241205.013)

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssgAKCRDorT+BmrEO
# eM80AKCQkF3gcDZYHY0rpm3J4cQnkdEl3ACePQg3fh/m6daGIsN3l7sAAmDQRQA=
# =qN3k
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri Dec  6 00:44:02 2024 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2472 signatures in the past
#      3 years.  Encrypted 4 messages in the past 2 years.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Elliott Hughes (1) and techyminati (1)
# Via Automerger Merge Worker (13) and others
* tag 'android-15.0.0_r6':
  LatinIME: Fix Implicit PendingIntent Vulnerability
  Use the global default cpp_std.

Change-Id: I1617d2b3e9a5f930e42dfe2cd70748270921d68d
parents 8e6b955c 978319d8

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

native/dicttoolkit/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ package { 
cc_defaults {

    name: "dicttoolkit_defaults",



    cpp_std: "gnu++17",

    cflags: [

        "-Werror",

        "-Wall",

native/dicttoolkit/tests/utils/utf8_utils_test.cpp

+3 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ TEST(Utf8UtilsTests, TestGetCodePoints) { 
        EXPECT_EQ('t', codePoints[3]);

    }

    {

        const std::vector<int> codePoints = Utf8Utils::getCodePoints(u8"\u3042a\u03C2\u0410");

        const std::vector<int> codePoints = Utf8Utils::getCodePoints("\u3042a\u03C2\u0410");

        EXPECT_EQ(4u, codePoints.size());

        EXPECT_EQ(0x3042, codePoints[0]); // HIRAGANA LETTER A

        EXPECT_EQ('a', codePoints[1]);
@@ -48,7 +48,7 @@ TEST(Utf8UtilsTests, TestGetCodePoints) { 
        EXPECT_EQ(0x0410, codePoints[3]); // GREEK SMALL LETTER FINAL SIGMA

    }

    {

        const std::vector<int> codePoints = Utf8Utils::getCodePoints(u8"\U0001F36A?\U0001F752");

        const std::vector<int> codePoints = Utf8Utils::getCodePoints("\U0001F36A?\U0001F752");

        EXPECT_EQ(3u, codePoints.size());

        EXPECT_EQ(0x1F36A, codePoints[0]); // COOKIE

        EXPECT_EQ('?', codePoints[1]);
@@ -75,7 +75,7 @@ TEST(Utf8UtilsTests, TestGetUtf8String) { 
                0x1F36A /* COOKIE */,

                0x1F752 /* ALCHEMICAL SYMBOL FOR STARRED TRIDENT */

        };

        EXPECT_EQ(u8"\u00E0\u03C2\u0430\u3042\U0001F36A\U0001F752",

        EXPECT_EQ("\u00E0\u03C2\u0430\u3042\U0001F36A\U0001F752",

                Utf8Utils::getUtf8String(CodePointArrayView(codePoints)));

    }

}