Merge "Fix deadlock when create alert window notification" into oc-dev (678477b3) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/AlertWindowNotification.java

+7 −6

Original line number	Diff line number	Diff line
		@@ -63,12 +63,6 @@ class AlertWindowNotification {
		mNotificationTag = CHANNEL_PREFIX + mPackageName;
		mRequestCode = sNextRequestCode++;
		mIconUtilities = new IconUtilities(mService.mContext);
		if (sChannelGroup == null) {
		sChannelGroup = new NotificationChannelGroup(CHANNEL_PREFIX,
		mService.mContext.getString(
		R.string.alert_windows_notification_channel_group_name));
		mNotificationManager.createNotificationChannelGroup(sChannelGroup);
		}
		}

		void post() {
		@@ -143,6 +137,13 @@ class AlertWindowNotification {
		}

		private void createNotificationChannel(Context context, String appName) {
		if (sChannelGroup == null) {
		sChannelGroup = new NotificationChannelGroup(CHANNEL_PREFIX,
		mService.mContext.getString(
		R.string.alert_windows_notification_channel_group_name));
		mNotificationManager.createNotificationChannelGroup(sChannelGroup);
		}

		final String nameChannel =
		context.getString(R.string.alert_windows_notification_channel_name, appName);
		final NotificationChannel channel =