Merge "Protect possible NPE in MediaOutputDialogReceiver" into sc-dev (0e7fce7b) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputDialogReceiver.kt

+11 −2

Original line number	Diff line number	Diff line
		@@ -20,9 +20,13 @@ import android.content.BroadcastReceiver
		import android.content.Context
		import android.content.Intent
		import android.text.TextUtils
		import android.util.Log
		import com.android.settingslib.media.MediaOutputConstants
		import javax.inject.Inject

		private const val TAG = "MediaOutputDlgReceiver"
		private val DEBUG = Log.isLoggable(TAG, Log.DEBUG)

		/**
		* BroadcastReceiver for handling media output intent
		*/
		@@ -32,8 +36,13 @@ class MediaOutputDialogReceiver @Inject constructor(
		override fun onReceive(context: Context, intent: Intent) {
		if (TextUtils.equals(MediaOutputConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG,
		intent.action)) {
		mediaOutputDialogFactory.create(
		intent.getStringExtra(MediaOutputConstants.EXTRA_PACKAGE_NAME), false)
		val packageName: String? =
		intent.getStringExtra(MediaOutputConstants.EXTRA_PACKAGE_NAME)
		if (!TextUtils.isEmpty(packageName)) {
		mediaOutputDialogFactory.create(packageName!!, false)
		} else if (DEBUG) {
		Log.e(TAG, "Unable to launch media output dialog. Package name is empty.")
		}
		}
		}
		}