Merge "Resolve setContentIntent to single code path" (2fbb619b) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+15 −36

Original line number	Diff line number	Diff line
		@@ -1650,15 +1650,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		mContext, 0, snoozeIntent, FLAG_UPDATE_CURRENT \| FLAG_IMMUTABLE));

		final Intent viewIntent = buildViewDataUsageIntent(res, policy.template);
		// TODO: Resolve to single code path.
		if (UserManager.isHeadlessSystemUserMode()) {
		builder.setContentIntent(PendingIntent.getActivityAsUser(
		mContext, 0, viewIntent, FLAG_UPDATE_CURRENT \| FLAG_IMMUTABLE,
		/* options= */ null, UserHandle.CURRENT));
		} else {
		builder.setContentIntent(PendingIntent.getActivity(
		mContext, 0, viewIntent, FLAG_UPDATE_CURRENT \| FLAG_IMMUTABLE));
		}
		setContentIntent(builder, viewIntent);
		break;
		}
		case TYPE_LIMIT: {
		@@ -1679,15 +1671,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		builder.setSmallIcon(R.drawable.stat_notify_disabled_data);

		final Intent intent = buildNetworkOverLimitIntent(res, policy.template);
		// TODO: Resolve to single code path.
		if (UserManager.isHeadlessSystemUserMode()) {
		builder.setContentIntent(PendingIntent.getActivityAsUser(
		mContext, 0, intent, FLAG_UPDATE_CURRENT \| FLAG_IMMUTABLE,
		/* options= */ null, UserHandle.CURRENT));
		} else {
		builder.setContentIntent(PendingIntent.getActivity(
		mContext, 0, intent, FLAG_UPDATE_CURRENT \| FLAG_IMMUTABLE));
		}
		setContentIntent(builder, intent);
		break;
		}
		case TYPE_LIMIT_SNOOZED: {
		@@ -1711,15 +1695,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		builder.setChannelId(SystemNotificationChannels.NETWORK_STATUS);

		final Intent intent = buildViewDataUsageIntent(res, policy.template);
		// TODO: Resolve to single code path.
		if (UserManager.isHeadlessSystemUserMode()) {
		builder.setContentIntent(PendingIntent.getActivityAsUser(
		mContext, 0, intent, FLAG_UPDATE_CURRENT \| FLAG_IMMUTABLE,
		/* options= */ null, UserHandle.CURRENT));
		} else {
		builder.setContentIntent(PendingIntent.getActivity(
		mContext, 0, intent, FLAG_UPDATE_CURRENT \| FLAG_IMMUTABLE));
		}
		setContentIntent(builder, intent);
		break;
		}
		case TYPE_RAPID: {
		@@ -1739,15 +1715,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		mContext, 0, snoozeIntent, FLAG_UPDATE_CURRENT \| FLAG_IMMUTABLE));

		final Intent viewIntent = buildViewDataUsageIntent(res, policy.template);
		// TODO: Resolve to single code path.
		if (UserManager.isHeadlessSystemUserMode()) {
		builder.setContentIntent(PendingIntent.getActivityAsUser(
		mContext, 0, viewIntent, FLAG_UPDATE_CURRENT \| FLAG_IMMUTABLE,
		/* options= */ null, UserHandle.CURRENT));
		} else {
		builder.setContentIntent(PendingIntent.getActivity(
		mContext, 0, viewIntent, FLAG_UPDATE_CURRENT \| FLAG_IMMUTABLE));
		}
		setContentIntent(builder, viewIntent);
		break;
		}
		default: {
		@@ -1765,6 +1733,17 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		mActiveNotifs.add(notificationId);
		}

		private void setContentIntent(Notification.Builder builder, Intent intent) {
		if (UserManager.isHeadlessSystemUserMode()) {
		builder.setContentIntent(PendingIntent.getActivityAsUser(
		mContext, 0, intent, FLAG_UPDATE_CURRENT \| FLAG_IMMUTABLE,
		/* options= */ null, UserHandle.CURRENT));
		} else {
		builder.setContentIntent(PendingIntent.getActivity(
		mContext, 0, intent, FLAG_UPDATE_CURRENT \| FLAG_IMMUTABLE));
		}
		}

		private void cancelNotification(NotificationId notificationId) {
		mContext.getSystemService(NotificationManager.class).cancel(notificationId.getTag(),
		notificationId.getId());