PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Catch SecurityException from NoMan to workaround possible race condition" into tm-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-04-16 05:10:12 +00:00
committed by Android (Google) Code Review
parent cf80645111 bee13b6305
commit 1cd4d369a2
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/notification/NotificationListener.java
+17 -12
View File
@@ -35,6 +35,7 @@ import android.util.Log;
import android.util.Pair;
import androidx.annotation.AnyThread;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.WorkerThread;
@@ -154,14 +155,9 @@ public class NotificationListener extends NotificationListenerService {
case MSG_NOTIFICATION_FULL_REFRESH:
List<StatusBarNotification> activeNotifications = null;
if (sIsConnected) {
try {
activeNotifications = Arrays.stream(getActiveNotifications())
.filter(this::notificationIsValidForUI)
.collect(Collectors.toList());
} catch (SecurityException ex) {
Log.e(TAG, "SecurityException: failed to fetch notifications");
activeNotifications = new ArrayList<>();
}
activeNotifications = Arrays.stream(getActiveNotificationsSafely(null))
.filter(this::notificationIsValidForUI)
.collect(Collectors.toList());
} else {
activeNotifications = new ArrayList<>();
}
@@ -175,7 +171,7 @@ public class NotificationListener extends NotificationListenerService {
}
case MSG_RANKING_UPDATE: {
String[] keys = ((RankingMap) message.obj).getOrderedKeys();
for (StatusBarNotification sbn : getActiveNotifications(keys)) {
for (StatusBarNotification sbn : getActiveNotificationsSafely(keys)) {
updateGroupKeyIfNecessary(sbn);
}
return true;
@@ -214,6 +210,16 @@ public class NotificationListener extends NotificationListenerService {
return true;
}
private @NonNull StatusBarNotification[] getActiveNotificationsSafely(@Nullable String[] keys) {
StatusBarNotification[] result = null;
try {
result = getActiveNotifications(keys);
} catch (SecurityException e) {
Log.e(TAG, "SecurityException: failed to fetch notifications");
}
return result == null ? new StatusBarNotification[0] : result;
}
@Override
public void onListenerConnected() {
super.onListenerConnected();
@@ -313,9 +319,8 @@ public class NotificationListener extends NotificationListenerService {
*/
@WorkerThread
public List<StatusBarNotification> getNotificationsForKeys(List<NotificationKeyData> keys) {
StatusBarNotification[] notifications = getActiveNotifications(
keys.stream().map(n -> n.notificationKey).toArray(String[]::new));
return notifications == null ? Collections.emptyList() : Arrays.asList(notifications);
return Arrays.asList(getActiveNotificationsSafely(
keys.stream().map(n -> n.notificationKey).toArray(String[]::new)));
}
/**