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

Merge "Replace PendingIntent @hide APIs" am: 3b32517990 am: 97adf1f334 am: 1847f9be9a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456121

Change-Id: I837c5cd9ebc46e350e3c7950323614df4cbc38f3
This commit is contained in:
Paul Hu
2020-10-26 08:26:40 +00:00
committed by Automerger Merge Worker
parent 9b136ebaa0 1847f9be9a
commit d8bb35fdf5
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");
}
PendingIntent pendingIntent = PendingIntent.getActivityAsUser(
mContext,
PendingIntent pendingIntent = PendingIntent.getActivity(
mContext.createContextAsUser(UserHandle.CURRENT, 0 /* flags */),
0 /* requestCode */,
intent,
PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE,
null /* options */,
UserHandle.CURRENT);
PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);
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
protected PendingIntent createNotificationIntent() {
return PendingIntent.getActivityAsUser(mContext, 0 /* requestCode */, CELLULAR_SETTINGS,
PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE,
null /* options */, UserHandle.CURRENT);
return PendingIntent.getActivity(
mContext.createContextAsUser(UserHandle.CURRENT, 0 /* flags */),
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.