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

Merge "DO NOT MERGE - Disallow deletion of channels with FGS notifications" into sc-dev

Browse Source
This commit is contained in:
Chris Tate
2021-03-19 20:27:43 +00:00
committed by Android (Google) Code Review
parent 30491b1daf 529052350f
commit c243f46c6f
4 changed files with 104 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/app/ActivityManagerInternal.java
View File

@@ -449,6 +449,21 @@ public abstract class ActivityManagerInternal {
*/
public abstract boolean hasRunningForegroundService(int uid, int foregroundServiceType);
/**
* Returns {@code true} if the given notification channel currently has a
* notification associated with a foreground service. This is an AMS check
* because that is the source of truth for the FGS state.
*/
public abstract boolean hasForegroundServiceNotification(String pkg, @UserIdInt int userId,
String channelId);
/**
* If the given app has any FGSs whose notifications are in the given channel,
* stop them.
*/
public abstract void stopForegroundServicesForChannel(String pkg, @UserIdInt int userId,
String channelId);
/**
* Registers the specified {@code processObserver} to be notified of future changes to
* process state.

40
services/core/java/com/android/server/am/ActiveServices.java
View File

@@ -160,6 +160,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.function.Predicate;
@@ -559,6 +560,45 @@ public final class ActiveServices {
return smap != null ? smap.mStartingBackground.size() >= mMaxStartingBackground : false;
}
boolean hasForegroundServiceNotificationLocked(String pkg, int userId, String channelId) {
final ServiceMap smap = mServiceMap.get(userId);
if (smap != null) {
for (int i = 0; i < smap.mServicesByInstanceName.size(); i++) {
final ServiceRecord sr = smap.mServicesByInstanceName.valueAt(i);
if (sr.appInfo.packageName.equals(pkg) && sr.isForeground) {
if (Objects.equals(sr.foregroundNoti.getChannelId(), channelId)) {
if (DEBUG_FOREGROUND_SERVICE) {
Slog.d(TAG_SERVICE, "Channel u" + userId + "/pkg=" + pkg
+ "/channelId=" + channelId
+ " has fg service notification");
}
return true;
}
}
}
}
return false;
}
void stopForegroundServicesForChannelLocked(String pkg, int userId, String channelId) {
final ServiceMap smap = mServiceMap.get(userId);
if (smap != null) {
for (int i = 0; i < smap.mServicesByInstanceName.size(); i++) {
final ServiceRecord sr = smap.mServicesByInstanceName.valueAt(i);
if (sr.appInfo.packageName.equals(pkg) && sr.isForeground) {
if (Objects.equals(sr.foregroundNoti.getChannelId(), channelId)) {
if (DEBUG_FOREGROUND_SERVICE) {
Slog.d(TAG_SERVICE, "Stopping FGS u" + userId + "/pkg=" + pkg
+ "/channelId=" + channelId
+ " for conversation channel clear");
}
stopServiceLocked(sr, false);
}
}
}
}
}
private ServiceMap getServiceMapLocked(int callingUser) {
ServiceMap smap = mServiceMap.get(callingUser);
if (smap == null) {

16
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -15910,6 +15910,22 @@ public class ActivityManagerService extends IActivityManager.Stub
}
}
@Override
public boolean hasForegroundServiceNotification(String pkg, int userId,
String channelId) {
synchronized (ActivityManagerService.this) {
return mServices.hasForegroundServiceNotificationLocked(pkg, userId, channelId);
}
}
@Override
public void stopForegroundServicesForChannel(String pkg, int userId,
String channelId) {
synchronized (ActivityManagerService.this) {
mServices.stopForegroundServicesForChannelLocked(pkg, userId, channelId);
}
}
@Override
public void registerProcessObserver(IProcessObserver processObserver) {
ActivityManagerService.this.registerProcessObserver(processObserver);

40
services/core/java/com/android/server/notification/NotificationManagerService.java
View File

@@ -3576,15 +3576,30 @@ public class NotificationManagerService extends SystemService {
pkg, uid, channelId, conversationId, true, includeDeleted);
}
// Returns 'true' if the given channel has a notification associated
// with an active foreground service.
private void enforceDeletingChannelHasNoFgService(String pkg, int userId,
String channelId) {
if (mAmi.hasForegroundServiceNotification(pkg, userId, channelId)) {
Slog.w(TAG, "Package u" + userId + "/" + pkg
+ " may not delete notification channel '"
+ channelId + "' with fg service");
throw new SecurityException("Not allowed to delete channel " + channelId
+ " with a foreground service");
}
}
@Override
public void deleteNotificationChannel(String pkg, String channelId) {
checkCallerIsSystemOrSameApp(pkg);
final int callingUid = Binder.getCallingUid();
final int callingUser = UserHandle.getUserId(callingUid);
if (NotificationChannel.DEFAULT_CHANNEL_ID.equals(channelId)) {
throw new IllegalArgumentException("Cannot delete default channel");
}
enforceDeletingChannelHasNoFgService(pkg, callingUser, channelId);
cancelAllNotificationsInt(MY_UID, MY_PID, pkg, channelId, 0, 0, true,
UserHandle.getUserId(callingUid), REASON_CHANNEL_BANNED, null);
callingUser, REASON_CHANNEL_BANNED, null);
mPreferencesHelper.deleteNotificationChannel(pkg, callingUid, channelId);
mListeners.notifyNotificationChannelChanged(pkg,
UserHandle.getUserHandleForUid(callingUid),
@@ -3597,19 +3612,23 @@ public class NotificationManagerService extends SystemService {
public void deleteConversationNotificationChannels(String pkg, int uid,
String conversationId) {
checkCallerIsSystem();
final int callingUid = Binder.getCallingUid();
List<NotificationChannel> channels =
mPreferencesHelper.getNotificationChannelsByConversationId(
pkg, uid, conversationId);
if (!channels.isEmpty()) {
// Preflight for fg service notifications in these channels: do nothing
// unless they're all eligible
final int appUserId = UserHandle.getUserId(uid);
for (NotificationChannel nc : channels) {
final String channelId = nc.getId();
mAmi.stopForegroundServicesForChannel(pkg, appUserId, channelId);
cancelAllNotificationsInt(MY_UID, MY_PID, pkg, nc.getId(), 0, 0, true,
UserHandle.getUserId(callingUid), REASON_CHANNEL_BANNED, null);
mPreferencesHelper.deleteNotificationChannel(pkg, callingUid, nc.getId());
appUserId, REASON_CHANNEL_BANNED, null);
mPreferencesHelper.deleteNotificationChannel(pkg, uid, channelId);
mListeners.notifyNotificationChannelChanged(pkg,
UserHandle.getUserHandleForUid(callingUid),
UserHandle.getUserHandleForUid(uid),
mPreferencesHelper.getNotificationChannel(
pkg, callingUid, nc.getId(), true),
pkg, uid, channelId, true),
NOTIFICATION_CHANNEL_OR_GROUP_DELETED);
}
handleSavePolicyFile();
@@ -3640,13 +3659,20 @@ public class NotificationManagerService extends SystemService {
NotificationChannelGroup groupToDelete =
mPreferencesHelper.getNotificationChannelGroup(groupId, pkg, callingUid);
if (groupToDelete != null) {
// Preflight for allowability
final int userId = UserHandle.getUserId(callingUid);
List<NotificationChannel> groupChannels = groupToDelete.getChannels();
for (int i = 0; i < groupChannels.size(); i++) {
enforceDeletingChannelHasNoFgService(pkg, userId,
groupChannels.get(i).getId());
}
List<NotificationChannel> deletedChannels =
mPreferencesHelper.deleteNotificationChannelGroup(pkg, callingUid, groupId);
for (int i = 0; i < deletedChannels.size(); i++) {
final NotificationChannel deletedChannel = deletedChannels.get(i);
cancelAllNotificationsInt(MY_UID, MY_PID, pkg, deletedChannel.getId(), 0, 0,
true,
UserHandle.getUserId(Binder.getCallingUid()), REASON_CHANNEL_BANNED,
userId, REASON_CHANNEL_BANNED,
null);
mListeners.notifyNotificationChannelChanged(pkg,
UserHandle.getUserHandleForUid(callingUid),