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

Merge "Replace PendingIntent @hide APIs" am: 1cec9a2671 am: 97adf1f334

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

Change-Id: I18693b621bcae7a011719324bd8bede302d22efb
This commit is contained in:
Paul Hu
2020-10-26 07:59:15 +00:00
committed by Automerger Merge Worker
parent 75c5434ddd 97adf1f334
commit 17e6bc6a4c
3 changed files with 11 additions and 10 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.

5
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -1969,8 +1969,9 @@ public class Vpn {
*/
public PendingIntent pendingIntentGetActivityAsUser(
Intent intent, int flags, UserHandle user) {
return PendingIntent.getActivityAsUser(mContext, 0 /*request*/, intent, flags,
null /*options*/, user);
return PendingIntent.getActivity(
mContext.createContextAsUser(user, 0 /* flags */), 0 /* requestCode */,
intent, flags);
}
/**