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

Commit 0d094ad3 authored by Sarah Chin's avatar Sarah Chin Committed by Android (Google) Code Review
Browse files

Merge "Move phone ID to extra for action provision" into rvc-qpr-dev

parents 0c73e5b4 4d810d41

core/java/android/net/ConnectivityManager.java

+2 −2
Original line number Diff line number Diff line
@@ -3117,7 +3117,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
@@ -324,7 +324,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, intent, 0);

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

        } else {