diff options
| author |   Xin Li <delphij@google.com> | 2023-10-05 15:42:04 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2023-10-05 15:42:04 -0700 |
| commit | 2f0ac318043a47fa1a4250425d1f317639d89216 (patch) | |
| tree | 5e936bd778cbd4e7f9027628dc8f7b09aadeccb1 /java/src | |
| parent | d847619a2b48945465f840b8d81644fa455cc115 (diff) | |
| parent | 176fd72c0fd4c5e79daf015460a52865ed890bb2 (diff) | |
| download | latinime-2f0ac318043a47fa1a4250425d1f317639d89216.tar.gz latinime-2f0ac318043a47fa1a4250425d1f317639d89216.tar.xz latinime-2f0ac318043a47fa1a4250425d1f317639d89216.zip | |
Merge Android 14
Bug: 298295554
Merged-In: Ia66766322d6ae8a010b1cb55cc22993fbc6d012c
Change-Id: Ic4fcb094b37b72031f9bbd615e2044164aa460a6
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinIME.java | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index 8ed3a59bf..e68b43b39 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -628,16 +628,31 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen final IntentFilter newDictFilter = new IntentFilter(); newDictFilter.addAction(DictionaryPackConstants.NEW_DICTIONARY_INTENT_ACTION); - registerReceiver(mDictionaryPackInstallReceiver, newDictFilter); + 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); - registerReceiver(mDictionaryDumpBroadcastReceiver, dictDumpFilter); + 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); } |