Merge "ChooserActivity populates intentFilter mimeType with intent.getType() prior to intent.getDataString(). This fixes the issue in screenshot sharing that no or much less than usual direct share recommendations surface." into tm-dev am: 6c90bbe1cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18213842 Change-Id: If8bfc9a0be5bafcb4b2fb837666d95979a9903c3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -1861,10 +1861,10 @@ public class ChooserActivity extends ResolverActivity implements
|
|||||||
try {
|
try {
|
||||||
final Intent intent = getTargetIntent();
|
final Intent intent = getTargetIntent();
|
||||||
String dataString = intent.getDataString();
|
String dataString = intent.getDataString();
|
||||||
|
if (intent.getType() == null) {
|
||||||
if (!TextUtils.isEmpty(dataString)) {
|
if (!TextUtils.isEmpty(dataString)) {
|
||||||
return new IntentFilter(intent.getAction(), dataString);
|
return new IntentFilter(intent.getAction(), dataString);
|
||||||
}
|
}
|
||||||
if (intent.getType() == null) {
|
|
||||||
Log.e(TAG, "Failed to get target intent filter: intent data and type are null");
|
Log.e(TAG, "Failed to get target intent filter: intent data and type are null");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user