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

Commit aa95da1e authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Move phone ID to extra for action provision" am: fee0474f 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd950c7615945334cbf932beed42d20c41e968c3
parents f0b1601c fee0474f

core/java/android/net/ConnectivityManager.java

+2 −2
Original line number Diff line number Diff line
@@ -3154,7 +3154,7 @@ public class ConnectivityManager { 
    /**

     * Set sign in error notification to visible or invisible

     *

     * {@hide}

     * @hide

     * @deprecated Doesn't properly deal with multiple connected networks of the same type.

     */

    @Deprecated

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

+7 −1
Original line number Diff line number Diff line
@@ -334,7 +334,13 @@ public class NetworkNotificationManager { 
     */

    public void setProvNotificationVisible(boolean visible, int id, String action) {

        if (visible) {

            Intent intent = new Intent(action);

            // For legacy purposes, action is sent as the action + the phone ID from DcTracker.

            // Split the string here and send the phone ID as an extra instead.

            String[] splitAction = action.split(":");

            Intent intent = new Intent(splitAction[0]);

            try {

                intent.putExtra("provision.phone.id", Integer.parseInt(splitAction[1]));

            } catch (NumberFormatException ignored) { }

            PendingIntent pendingIntent = PendingIntent.getBroadcast(

                    mContext, 0 /* requestCode */, intent, PendingIntent.FLAG_IMMUTABLE);

            showNotification(id, NotificationType.SIGN_IN, null, null, pendingIntent, false);