Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 404c963a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Resolve setContentIntent to single code path" am: 2fbb619b am:... 

Merge "Resolve setContentIntent to single code path" am: 2fbb619b am: 6afd211e am: 5d4b952b am: 73d68061

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2443102



Change-Id: I8479a8bff24147d41330b08d591e3b83913e65df
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e5b2ec4c 73d68061

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());