Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sarah Chin
2020-12-17 08:08:14 +00:00
committed by Android (Google) Code Review
parent 0c73e5b4e9 4d810d4113
commit 0d094ad38e
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/net/ConnectivityManager.java
View File

@@ -3115,9 +3115,9 @@ public class ConnectivityManager {
} }
/** /**
* 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 Doesn't properly deal with multiple connected networks of the same type.
*/ */
@Deprecated @Deprecated

8
services/core/java/com/android/server/connectivity/NetworkNotificationManager.java
View File

@@ -324,7 +324,13 @@ public class NetworkNotificationManager {
*/ */
public void setProvNotificationVisible(boolean visible, int id, String action) { public void setProvNotificationVisible(boolean visible, int id, String action) {
if (visible) { 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); PendingIntent pendingIntent = PendingIntent.getBroadcast(mContext, 0, intent, 0);
showNotification(id, NotificationType.SIGN_IN, null, null, pendingIntent, false); showNotification(id, NotificationType.SIGN_IN, null, null, pendingIntent, false);
} else { } else {