diff options
| author | 2024-04-03 15:37:12 -0400 | |
|---|---|---|
| committer | 2024-04-04 20:44:58 +0000 | |
| commit | 6f0791d450bfcbfbb2424912531338de354644f7 (patch) | |
| tree | ac6c61b1ba51e5587c048b85e286a117da5186cf /AndroidManifest-app.xml | |
| parent | 9f4e2ece250f07e214231a89c9aa74ab19d35d30 (diff) | |
Collapse v2 fork
This is an internal merge of v2.* code back into a single
set of code. The ChooserSelector mechanism is removed and
usage of the 'modular_framework' AConfig flag is also removed.
Test: atest --test-mapping packages/modules/IntentResolver
Bug: NA
Flag: None
Change-Id: I8bb34613e5a042cfbcd8fe2654b8121560a47b03
Diffstat (limited to 'AndroidManifest-app.xml')
| -rw-r--r-- | AndroidManifest-app.xml | 41 |
1 files changed, 1 insertions, 40 deletions
diff --git a/AndroidManifest-app.xml b/AndroidManifest-app.xml index ec4fec85..d45a13e0 100644 --- a/AndroidManifest-app.xml +++ b/AndroidManifest-app.xml @@ -32,42 +32,7 @@ android:requiredForAllUsers="true" android:supportsRtl="true"> - <!-- This alias needs to be maintained until there are no more devices that could be - upgrading from T QPR3. (b/283722356) --> - <activity-alias - android:name=".ChooserActivityLauncher" - android:targetActivity=".ChooserActivity" - android:exported="true"> - - <!-- This intent filter is assigned a priority greater than 100 so - that it will take precedence over the framework ChooserActivity - in the process of resolving implicit action.CHOOSER intents - whenever this activity is enabled by the experiment flag. --> - <intent-filter android:priority="500"> - <action android:name="android.intent.action.CHOOSER" /> - <category android:name="android.intent.category.DEFAULT" /> - <category android:name="android.intent.category.VOICE" /> - </intent-filter> - </activity-alias> - <activity android:name=".ChooserActivity" - android:theme="@style/Theme.DeviceDefault.Chooser" - android:finishOnCloseSystemDialogs="true" - android:excludeFromRecents="true" - android:documentLaunchMode="never" - android:relinquishTaskIdentity="true" - android:configChanges="screenSize|smallestScreenSize|screenLayout|keyboard|keyboardHidden" - android:visibleToInstantApps="true" - android:exported="false"/> - - <receiver android:name="com.android.intentresolver.v2.ChooserSelector" - android:exported="true"> - <intent-filter> - <action android:name="android.intent.action.BOOT_COMPLETED" /> - </intent-filter> - </receiver> - - <activity android:name="com.android.intentresolver.v2.ChooserActivity" android:enabled="false" android:theme="@style/Theme.DeviceDefault.Chooser" android:finishOnCloseSystemDialogs="true" @@ -78,11 +43,7 @@ android:visibleToInstantApps="true" android:exported="true"> - <!-- This intent filter is assigned a priority greater than 500 so - that it will take precedence over the ChooserActivity - in the process of resolving implicit action.CHOOSER intents - whenever this activity is enabled by the experiment flag. --> - <intent-filter android:priority="501"> + <intent-filter android:priority="500"> <action android:name="android.intent.action.CHOOSER" /> <category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.VOICE" /> |