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

Merge "wifi: Fix the Security Report for pending intent" into sc-dev

Browse Source
This commit is contained in:
Les Lee
2021-07-02 02:39:38 +00:00
committed by Android (Google) Code Review
parent 733537f1a6 90a78649f2
commit 0d6266ee6c
1 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
packages/SettingsProvider/src/com/android/providers/settings/WifiSoftApConfigChangedNotifier.java
View File

@@ -15,17 +15,24 @@
*/ */
package com.android.providers.settings; package com.android.providers.settings;
import android.app.ActivityManager;
import android.app.Notification; import android.app.Notification;
import android.app.NotificationChannel; import android.app.NotificationChannel;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.content.res.Resources; import android.content.res.Resources;
import android.os.UserHandle;
import android.provider.Settings;
import com.android.internal.messages.nano.SystemMessageProto; import com.android.internal.messages.nano.SystemMessageProto;
import com.android.internal.notification.SystemNotificationChannels; import com.android.internal.notification.SystemNotificationChannels;
import java.util.List;
/** /**
* Helper class for sending notifications when the user's Soft AP config was changed upon restore. * Helper class for sending notifications when the user's Soft AP config was changed upon restore.
*/ */
@@ -81,8 +88,25 @@ public class WifiSoftApConfigChangedNotifier {
private static PendingIntent getPendingActivity(Context context) { private static PendingIntent getPendingActivity(Context context) {
Intent intent = new Intent("com.android.settings.WIFI_TETHER_SETTINGS") Intent intent = new Intent("com.android.settings.WIFI_TETHER_SETTINGS")
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.setPackage(getSettingsPackageName(context));
return PendingIntent.getActivity(context, 0, intent, return PendingIntent.getActivity(context, 0, intent,
PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
} }
/**
* @return Get settings package name.
*/
private static String getSettingsPackageName(Context context) {
if (context == null) return null;
Intent intent = new Intent(Settings.ACTION_WIFI_SETTINGS);
List<ResolveInfo> resolveInfos = context.getPackageManager().queryIntentActivitiesAsUser(
intent, PackageManager.MATCH_SYSTEM_ONLY | PackageManager.MATCH_DEFAULT_ONLY,
UserHandle.of(ActivityManager.getCurrentUser()));
if (resolveInfos == null || resolveInfos.isEmpty()) {
return "com.android.settings";
}
return resolveInfos.get(0).activityInfo.packageName;
}
} }