Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove old ChooserActivity from manifest" into udc-dev am: 39b0b95d3d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23213280

Change-Id: I17b2fce7673ab14c5c036534bc8c04b20f5e3a16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Matt Casey
2023-05-13 02:54:08 +00:00
committed by Automerger Merge Worker
parent 0aabfbded0 39b0b95d3d
commit b91e2b0f23
2 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/app/ChooserActivity.java
View File

@@ -165,9 +165,11 @@ import java.util.function.Supplier;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
* The Chooser Activity handles intent resolution specifically for sharing intents - * This is the legacy ChooserActivity and is not expected to be invoked, it's only here because
* for example, those generated by @see android.content.Intent#createChooser(Intent, CharSequence). * MediaAppSelectorActivity is still depending on it. The actual chooser used by the system is
* at packages/modules/IntentResolver/java/src/com/android/intentresolver/ChooserActivity.java
* *
* The migration to the new package will be completed in a later release.
*/ */
public class ChooserActivity extends ResolverActivity implements public class ChooserActivity extends ResolverActivity implements
ChooserListAdapter.ChooserListCommunicator, ChooserListAdapter.ChooserListCommunicator,

16
core/res/AndroidManifest.xml
View File

@@ -7692,22 +7692,6 @@
android:defaultToDeviceProtectedStorage="true" android:defaultToDeviceProtectedStorage="true"
android:forceQueryable="true" android:forceQueryable="true"
android:directBootAware="true"> android:directBootAware="true">
<activity android:name="com.android.internal.app.ChooserActivity"
android:theme="@style/Theme.DeviceDefault.Chooser"
android:finishOnCloseSystemDialogs="true"
android:excludeFromRecents="true"
android:documentLaunchMode="never"
android:relinquishTaskIdentity="true"
android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboard|keyboardHidden"
android:process=":ui"
android:exported="true"
android:visibleToInstantApps="true">
<intent-filter android:priority="100">
<action android:name="android.intent.action.CHOOSER" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE" />
</intent-filter>
</activity>
<activity android:name="com.android.internal.accessibility.dialog.AccessibilityShortcutChooserActivity" <activity android:name="com.android.internal.accessibility.dialog.AccessibilityShortcutChooserActivity"
android:exported="false" android:exported="false"
android:theme="@style/Theme.DeviceDefault.Dialog.Alert.DayNight" android:theme="@style/Theme.DeviceDefault.Dialog.Alert.DayNight"