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

Commit 97adf1f3 authored by Paul Hu's avatar Paul Hu Committed by Automerger Merge Worker
Browse files

Merge "Replace PendingIntent @hide APIs" am: 1cec9a26 

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

Change-Id: I134bd5f89973e242f7b75f2baa4617e8ad1cb644
parents b37753c2 1cec9a26

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

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

        }



        PendingIntent pendingIntent = PendingIntent.getActivityAsUser(

                mContext,

        PendingIntent pendingIntent = PendingIntent.getActivity(

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

                0 /* requestCode */,

                intent,

                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE,

                null /* options */,

                UserHandle.CURRENT);

                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);



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

    }

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

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


    @VisibleForTesting

    protected PendingIntent createNotificationIntent() {

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

                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE,

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

        return PendingIntent.getActivity(

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

                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.

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

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

        public PendingIntent pendingIntentGetActivityAsUser(

                Intent intent, int flags, UserHandle user) {

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

                    null /*options*/, user);

            return PendingIntent.getActivity(

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

                    intent, flags);

        }



        /**