LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move phone ID to extra for action provision

Browse Source 
Previously, the phone ID was appended to the broadcast in DCT and sent
to ConnectivityManager. Instead of sending both as an action, send the
phone ID as an extra instead to make the action a protected broadcast.

Test: manually verify a SecurityException when action provision is sent
Test: atest DcTrackerTest
Bug: 172459128
Change-Id: Ic4129def86949d7191d15056852718dadbd72fba
Merged-In: Ic4129def86949d7191d15056852718dadbd72fba
This commit is contained in:
Sarah Chin
2020-11-25 12:15:14 -08:00
parent 8a1fc4cc51
commit ef1dd4e469
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

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) {
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 {