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

Author: Sarah Chin

core/java/android/net/ConnectivityManager.java

@@ -3115,9 +3115,9 @@ public String getMobileProvisioningUrl() {
     }
 
     /**
-     * Set sign in error notification to visible or in visible
+     * 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

@@ -324,7 +324,13 @@ public void clearNotification(int id) {
      */
     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 {