Merge "Fix #62169466 bug report sharing options empty" into oc-dev am: 4d473c65cb (44ff1b7e) · Commits · e / os / android_frameworks_base

packages/Shell/src/com/android/shell/BugreportProgressService.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -958,17 +958,24 @@ public class BugreportProgressService extends Service {
		}

		final Intent notifIntent;
		boolean useChooser = true;

		// Send through warning dialog by default
		if (getWarningState(mContext, STATE_UNKNOWN) != STATE_HIDE) {
		notifIntent = buildWarningIntent(mContext, sendIntent);
		// No need to show a chooser in this case.
		useChooser = false;
		} else {
		notifIntent = sendIntent;
		}
		notifIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

		// Send the share intent...
		if (useChooser) {
		sendShareIntent(mContext, notifIntent);
		} else {
		mContext.startActivity(notifIntent);
		}

		// ... and stop watching this process.
		stopProgress(id);