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

Merge "Replace PendingIntent @hide APIs"

Browse Source
This commit is contained in:
Paul Hu
2020-10-26 07:32:56 +00:00
committed by Gerrit Code Review
parent de9d06b653 2af502226a
commit c04c6aaf58
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -3998,13 +3998,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
settingsPkgName + ".wifi.WifiNoInternetDialog"); settingsPkgName + ".wifi.WifiNoInternetDialog");
} }
PendingIntent pendingIntent = PendingIntent.getActivityAsUser( PendingIntent pendingIntent = PendingIntent.getActivity(
mContext, mContext.createContextAsUser(UserHandle.CURRENT, 0 /* flags */),
0 /* requestCode */, 0 /* requestCode */,
intent, intent,
PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE, PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);
null /* options */,
UserHandle.CURRENT);
mNotifier.showNotification(nai.network.netId, type, nai, null, pendingIntent, highPriority); mNotifier.showNotification(nai.network.netId, type, nai, null, pendingIntent, highPriority);
} }

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

@@ -159,9 +159,11 @@ public class LingerMonitor {
@VisibleForTesting @VisibleForTesting
protected PendingIntent createNotificationIntent() { protected PendingIntent createNotificationIntent() {
return PendingIntent.getActivityAsUser(mContext, 0 /* requestCode */, CELLULAR_SETTINGS, return PendingIntent.getActivity(
PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE, mContext.createContextAsUser(UserHandle.CURRENT, 0 /* flags */),
null /* options */, UserHandle.CURRENT); 0 /* requestCode */,
CELLULAR_SETTINGS,
PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);
} }
// Removes any notification that was put up as a result of switching to nai. // Removes any notification that was put up as a result of switching to nai.