Merge "Handle the case of null intent type when obtaining target intent filter." (33b5e30f) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/ChooserActivity.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -1805,6 +1805,10 @@ public class ChooserActivity extends ResolverActivity implements
		if (!TextUtils.isEmpty(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");
		return null;
		}
		IntentFilter intentFilter = new IntentFilter(intent.getAction(), intent.getType());
		List<Uri> contentUris = new ArrayList<>();
		if (Intent.ACTION_SEND.equals(intent.getAction())) {
		@@ -1825,7 +1829,7 @@ public class ChooserActivity extends ResolverActivity implements
		}
		return intentFilter;
		} catch (Exception e) {
		Log.e(TAG, "failed to get target intent filter", e);
		Log.e(TAG, "Failed to get target intent filter", e);
		return null;
		}
		}