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

Commit 1cec9a26 authored by Paul Hu's avatar Paul Hu Committed by Gerrit Code Review
Browse files

Merge "Replace PendingIntent @hide APIs"

parents c5d02da0 9b1ed6b0

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

+3 −5
Original line number Original line Diff line number Diff line
@@ -3998,13 +3998,11 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                    settingsPkgName + ".wifi.WifiNoInternetDialog");

                    settingsPkgName + ".wifi.WifiNoInternetDialog");

        }

        }





        PendingIntent pendingIntent = PendingIntent.getActivityAsUser(

        PendingIntent pendingIntent = PendingIntent.getActivity(

                mContext,

                mContext.createContextAsUser(UserHandle.CURRENT, 0 /* flags */),

                0 /* requestCode */,

                0 /* requestCode */,

                intent,

                intent,

                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE,

                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);

                null /* options */,

                UserHandle.CURRENT);





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

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

    }

    }

services/core/java/com/android/server/connectivity/LingerMonitor.java

+5 −3
Original line number Original line Diff line number Diff line
@@ -159,9 +159,11 @@ public class LingerMonitor { 




    @VisibleForTesting

    @VisibleForTesting

    protected PendingIntent createNotificationIntent() {

    protected PendingIntent createNotificationIntent() {

        return PendingIntent.getActivityAsUser(mContext, 0 /* requestCode */, CELLULAR_SETTINGS,

        return PendingIntent.getActivity(

                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE,

                mContext.createContextAsUser(UserHandle.CURRENT, 0 /* flags */),

                null /* options */, UserHandle.CURRENT);

                0 /* requestCode */,

                CELLULAR_SETTINGS,

                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);

    }

    }





    // Removes any notification that was put up as a result of switching to nai.

    // Removes any notification that was put up as a result of switching to nai.

services/core/java/com/android/server/connectivity/Vpn.java

+3 −2
Original line number Original line Diff line number Diff line
@@ -1969,8 +1969,9 @@ public class Vpn { 
         */

         */

        public PendingIntent pendingIntentGetActivityAsUser(

        public PendingIntent pendingIntentGetActivityAsUser(

                Intent intent, int flags, UserHandle user) {

                Intent intent, int flags, UserHandle user) {

            return PendingIntent.getActivityAsUser(mContext, 0 /*request*/, intent, flags,

            return PendingIntent.getActivity(

                    null /*options*/, user);

                    mContext.createContextAsUser(user, 0 /* flags */), 0 /* requestCode */,

                    intent, flags);

        }

        }





        /**

        /**