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

Commit 3932195a authored by Michael Groover's avatar Michael Groover
Browse files

Add required flag to receivers in LatinIME 

Android T allows apps to declare a runtime receiver as not exported
by invoking registerReceiver with a new RECEIVER_NOT_EXPORTED flag;
receivers registered with this flag will only receive broadcasts from
the platform and the app itself. However to ensure developers can
properly protect their receivers, all apps targeting U
and registering a receiver for non-system broadcasts must
specify either the exported or not exported flag when invoking
registerReceiver; if one of these flags is not provided, the
platform will throw a SecurityException. This commit updates
the dictionary receivers with the RECEIVER_NOT_EXPORTED flag since
these are only sent from the local app. The HIDE_SOFT_INPUT
receiver is flagged with the RECEIVER_EXPORTED flag since it
can be sent by any app with the corresponding permission.

Bug: 234659204
Test: Build
Change-Id: I2b9a1360e0eb1c1965c07cc71dca9f11eb153517
parent 213f4d56

java/src/com/android/inputmethod/latin/LatinIME.java

+19 −4
Original line number Diff line number Diff line
@@ -628,16 +628,31 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen 


        final IntentFilter newDictFilter = new IntentFilter();

        newDictFilter.addAction(DictionaryPackConstants.NEW_DICTIONARY_INTENT_ACTION);

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {

            registerReceiver(mDictionaryPackInstallReceiver, newDictFilter,

                    Context.RECEIVER_NOT_EXPORTED);

        } else {

            registerReceiver(mDictionaryPackInstallReceiver, newDictFilter);

        }



        final IntentFilter dictDumpFilter = new IntentFilter();

        dictDumpFilter.addAction(DictionaryDumpBroadcastReceiver.DICTIONARY_DUMP_INTENT_ACTION);

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {

            registerReceiver(mDictionaryDumpBroadcastReceiver, dictDumpFilter,

                    Context.RECEIVER_NOT_EXPORTED);

        } else {

            registerReceiver(mDictionaryDumpBroadcastReceiver, dictDumpFilter);

        }



        final IntentFilter hideSoftInputFilter = new IntentFilter();

        hideSoftInputFilter.addAction(ACTION_HIDE_SOFT_INPUT);

        registerReceiver(mHideSoftInputReceiver, hideSoftInputFilter, PERMISSION_HIDE_SOFT_INPUT,

                null /* scheduler */);

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {

            registerReceiver(mHideSoftInputReceiver, hideSoftInputFilter,

                    PERMISSION_HIDE_SOFT_INPUT, null /* scheduler */, Context.RECEIVER_EXPORTED);

        } else {

            registerReceiver(mHideSoftInputReceiver, hideSoftInputFilter,

                    PERMISSION_HIDE_SOFT_INPUT, null /* scheduler */);

        }



        StatsUtils.onCreate(mSettings.getCurrent(), mRichImm);

    }