Merge "Add an exported flag in manifest" am: 2e60c56ea9 am: 6f1b6d7a94 am: 0428fa5453 am: 7bc73dd05d am: 524759aa51

Change-Id: Ib9cf1a96282c53a7b326f102f7f296a2629c2eb9
main
Treehugger Robot 2020-03-31 22:38:02 +00:00 committed by Automerger Merge Worker
commit 65eac6cef3
2 changed files with 120 additions and 114 deletions

View File

@ -19,7 +19,8 @@
package="com.android.inputmethod.latin" package="com.android.inputmethod.latin"
android:versionCode="28"> android:versionCode="28">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" /> <uses-sdk android:minSdkVersion="21"
android:targetSdkVersion="28"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION"/> <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION"/>
@ -63,16 +64,19 @@
<!-- Services --> <!-- Services -->
<service android:name="LatinIME" <service android:name="LatinIME"
android:label="@string/english_ime_name" android:label="@string/english_ime_name"
android:permission="android.permission.BIND_INPUT_METHOD"> android:permission="android.permission.BIND_INPUT_METHOD"
android:exported="true">
<intent-filter> <intent-filter>
<action android:name="android.view.InputMethod"/> <action android:name="android.view.InputMethod"/>
</intent-filter> </intent-filter>
<meta-data android:name="android.view.im" android:resource="@xml/method" /> <meta-data android:name="android.view.im"
android:resource="@xml/method"/>
</service> </service>
<service android:name=".spellcheck.AndroidSpellCheckerService" <service android:name=".spellcheck.AndroidSpellCheckerService"
android:label="@string/spell_checker_service_name" android:label="@string/spell_checker_service_name"
android:permission="android.permission.BIND_TEXT_SERVICE"> android:permission="android.permission.BIND_TEXT_SERVICE"
android:exported="true">
<intent-filter> <intent-filter>
<action android:name="android.service.textservice.SpellCheckerService"/> <action android:name="android.service.textservice.SpellCheckerService"/>
</intent-filter> </intent-filter>
@ -90,15 +94,15 @@
android:label="@string/english_ime_name" android:label="@string/english_ime_name"
android:icon="@drawable/ic_launcher_keyboard" android:icon="@drawable/ic_launcher_keyboard"
android:launchMode="singleTask" android:launchMode="singleTask"
android:noHistory="true"> android:noHistory="true"
android:exported="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity android:name=".permissions.PermissionsActivity"
android:name=".permissions.PermissionsActivity"
android:theme="@android:style/Theme.Translucent.NoTitleBar" android:theme="@android:style/Theme.Translucent.NoTitleBar"
android:exported="false" android:exported="false"
android:taskAffinity=""> android:taskAffinity="">
@ -107,7 +111,8 @@
<activity android:name=".setup.SetupWizardActivity" <activity android:name=".setup.SetupWizardActivity"
android:theme="@style/platformActivityTheme" android:theme="@style/platformActivityTheme"
android:label="@string/english_ime_name" android:label="@string/english_ime_name"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true"
android:exported="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>
</intent-filter> </intent-filter>
@ -115,7 +120,8 @@
<activity android:name=".settings.SettingsActivity" <activity android:name=".settings.SettingsActivity"
android:theme="@style/platformSettingsTheme" android:theme="@style/platformSettingsTheme"
android:label="@string/english_ime_settings"> android:label="@string/english_ime_settings"
android:exported="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>
</intent-filter> </intent-filter>
@ -123,7 +129,8 @@
<activity android:name=".spellcheck.SpellCheckerSettingsActivity" <activity android:name=".spellcheck.SpellCheckerSettingsActivity"
android:theme="@style/platformSettingsTheme" android:theme="@style/platformSettingsTheme"
android:label="@string/android_spell_checker_settings"> android:label="@string/android_spell_checker_settings"
android:exported="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>
</intent-filter> </intent-filter>
@ -132,7 +139,8 @@
<activity android:name="com.android.inputmethod.dictionarypack.DictionarySettingsActivity" <activity android:name="com.android.inputmethod.dictionarypack.DictionarySettingsActivity"
android:theme="@style/platformSettingsTheme" android:theme="@style/platformSettingsTheme"
android:label="@string/dictionary_settings_title" android:label="@string/dictionary_settings_title"
android:uiOptions="splitActionBarWhenNarrow"> android:uiOptions="splitActionBarWhenNarrow"
android:exported="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>
</intent-filter> </intent-filter>
@ -140,7 +148,8 @@
<activity android:name="com.android.inputmethod.dictionarypack.DownloadOverMeteredDialog" <activity android:name="com.android.inputmethod.dictionarypack.DownloadOverMeteredDialog"
android:theme="@style/platformActivityTheme" android:theme="@style/platformActivityTheme"
android:label="@string/dictionary_install_over_metered_network_prompt"> android:label="@string/dictionary_install_over_metered_network_prompt"
android:exported="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>
</intent-filter> </intent-filter>
@ -151,7 +160,8 @@
android:exported="false"/> android:exported="false"/>
<!-- Broadcast receivers --> <!-- Broadcast receivers -->
<receiver android:name="SystemBroadcastReceiver"> <receiver android:name="SystemBroadcastReceiver"
android:exported="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MY_PACKAGE_REPLACED"/> <action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
<action android:name="android.intent.action.BOOT_COMPLETED"/> <action android:name="android.intent.action.BOOT_COMPLETED"/>
@ -160,13 +170,15 @@
</intent-filter> </intent-filter>
</receiver> </receiver>
<receiver android:name="DictionaryPackInstallBroadcastReceiver" android:exported="false"> <receiver android:name="DictionaryPackInstallBroadcastReceiver"
android:exported="false">
<intent-filter> <intent-filter>
<action android:name="com.android.inputmethod.dictionarypack.aosp.UNKNOWN_CLIENT"/> <action android:name="com.android.inputmethod.dictionarypack.aosp.UNKNOWN_CLIENT"/>
</intent-filter> </intent-filter>
</receiver> </receiver>
<receiver android:name="com.android.inputmethod.dictionarypack.EventHandler"> <receiver android:name="com.android.inputmethod.dictionarypack.EventHandler"
android:exported="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.DOWNLOAD_COMPLETE"/> <action android:name="android.intent.action.DOWNLOAD_COMPLETE"/>
<action android:name="android.intent.action.DATE_CHANGED"/> <action android:name="android.intent.action.DATE_CHANGED"/>
@ -176,7 +188,8 @@
</receiver> </receiver>
<!-- Broadcast receiver for AccountManager#LOGIN_ACCOUNTS_CHANGED_ACTION. --> <!-- Broadcast receiver for AccountManager#LOGIN_ACCOUNTS_CHANGED_ACTION. -->
<receiver android:name=".accounts.AccountsChangedReceiver"> <receiver android:name=".accounts.AccountsChangedReceiver"
android:exported="true">
<intent-filter> <intent-filter>
<action android:name="android.accounts.LOGIN_ACCOUNTS_CHANGED"/> <action android:name="android.accounts.LOGIN_ACCOUNTS_CHANGED"/>
</intent-filter> </intent-filter>

View File

@ -14,34 +14,27 @@
limitations under the License. limitations under the License.
--> -->
<manifest <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.inputmethod.tools.edittextvariations" package="com.android.inputmethod.tools.edittextvariations"
android:versionName="0.67" android:versionName="0.67"
android:versionCode="67" android:versionCode="67">
>
<supports-screens android:resizeable="true"/> <supports-screens android:resizeable="true"/>
<uses-sdk <uses-sdk android:targetSdkVersion="27"
android:targetSdkVersion="27"
android:minSdkVersion="11"/> android:minSdkVersion="11"/>
<application <application android:icon="@drawable/ic_launcher"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:allowBackup="false" android:allowBackup="false">
> <activity android:name=".EditTextVariations"
<activity
android:name=".EditTextVariations"
android:windowSoftInputMode="stateHidden|adjustPan" android:windowSoftInputMode="stateHidden|adjustPan"
android:theme="@style/defaultActivityTheme" android:theme="@style/defaultActivityTheme"
android:label="@string/app_name" android:label="@string/app_name"
> android:exported="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN"/> <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/> <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter> </intent-filter>
</activity> </activity>
<receiver <receiver android:name=".NotificationBroadcastReceiver"
android:name=".NotificationBroadcastReceiver"
android:exported="false"/> android:exported="false"/>
</application> </application>
</manifest> </manifest>