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

Commit 11da4ee3 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Automerger Merge Worker
Browse files

Merge "Make PendingIntent immutable and correct Settings package name" into... 

Merge "Make PendingIntent immutable and correct Settings package name" into rvc-dev am: 438073fc am: 02d6e628 am: c76202a0 am: effac8b5

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

Change-Id: Id153d2c42ae3ba8e00cd7c7a91257479fff965cf
parents 829c23e1 effac8b5

services/core/java/com/android/server/ConnectivityService.java

+26 −4
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ import android.app.BroadcastOptions; 
import android.app.NotificationManager;

import android.app.PendingIntent;

import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.ContentResolver;

import android.content.Context;

import android.content.Intent;
@@ -3078,7 +3079,11 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            // Only the system server can register notifications with package "android"

            final long token = Binder.clearCallingIdentity();

            try {

                pendingIntent = PendingIntent.getBroadcast(mContext, 0, intent, 0);

                pendingIntent = PendingIntent.getBroadcast(

                        mContext,

                        0 /* requestCode */,

                        intent,

                        PendingIntent.FLAG_IMMUTABLE);

            } finally {

                Binder.restoreCallingIdentity(token);

            }
@@ -3934,6 +3939,15 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        pw.decreaseIndent();

    }



    // TODO: This method is copied from TetheringNotificationUpdater. Should have a utility class to

    // unify the method.

    private static @NonNull String getSettingsPackageName(@NonNull final PackageManager pm) {

        final Intent settingsIntent = new Intent(Settings.ACTION_SETTINGS);

        final ComponentName settingsComponent = settingsIntent.resolveActivity(pm);

        return settingsComponent != null

                ? settingsComponent.getPackageName() : "com.android.settings";

    }



    private void showNetworkNotification(NetworkAgentInfo nai, NotificationType type) {

        final String action;

        final boolean highPriority;
@@ -3968,12 +3982,20 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        if (type != NotificationType.PRIVATE_DNS_BROKEN) {

            intent.setData(Uri.fromParts("netId", Integer.toString(nai.network.netId), null));

            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

            intent.setClassName("com.android.settings",

                    "com.android.settings.wifi.WifiNoInternetDialog");

            // Some OEMs have their own Settings package. Thus, need to get the current using

            // Settings package name instead of just use default name "com.android.settings".

            final String settingsPkgName = getSettingsPackageName(mContext.getPackageManager());

            intent.setClassName(settingsPkgName,

                    settingsPkgName + ".wifi.WifiNoInternetDialog");

        }



        PendingIntent pendingIntent = PendingIntent.getActivityAsUser(

                mContext, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT, null, UserHandle.CURRENT);

                mContext,

                0 /* requestCode */,

                intent,

                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE,

                null /* options */,

                UserHandle.CURRENT);



        mNotifier.showNotification(nai.network.netId, type, nai, null, pendingIntent, highPriority);

    }