Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0aa7287f authored by Alexander Roederer's avatar Alexander Roederer
Browse files

Cleanup imports in NotificationManagerService 

Make lint happy and cleanup imports in NotificationManagerService

Bug: 330214226
Test: Build
Change-Id: I94eab41376c73113edd5c21eabc9fa87267f55be
parent 946e512f

services/core/java/com/android/server/notification/NotificationManagerService.java

+5 −14
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ import static android.Manifest.permission.STATUS_BAR_SERVICE; 
import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND;

import static android.app.ActivityManagerInternal.ServiceNotificationPolicy.NOT_FOREGROUND_SERVICE;

import static android.app.AppOpsManager.MODE_ALLOWED;

import static android.app.Flags.FLAG_LIFETIME_EXTENSION_REFACTOR;

import static android.app.Flags.lifetimeExtensionRefactor;

import static android.app.Flags.updateRankingTime;

import static android.app.Notification.BubbleMetadata.FLAG_SUPPRESS_NOTIFICATION;

import static android.app.Notification.EXTRA_BUILDER_APPLICATION_INFO;

import static android.app.Notification.EXTRA_LARGE_ICON_BIG;
@@ -34,7 +37,6 @@ import static android.app.Notification.FLAG_AUTO_CANCEL; 
import static android.app.Notification.FLAG_BUBBLE;

import static android.app.Notification.FLAG_FOREGROUND_SERVICE;

import static android.app.Notification.FLAG_FSI_REQUESTED_BUT_DENIED;

import static android.app.Notification.FLAG_INSISTENT;

import static android.app.Notification.FLAG_LIFETIME_EXTENDED_BY_DIRECT_REPLY;

import static android.app.Notification.FLAG_NO_CLEAR;

import static android.app.Notification.FLAG_NO_DISMISS;
@@ -71,8 +73,6 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK; 
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_OFF;

import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON;

import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR;

import static android.app.Flags.FLAG_LIFETIME_EXTENSION_REFACTOR;

import static android.app.Flags.lifetimeExtensionRefactor;

import static android.app.NotificationManager.zenModeFromInterruptionFilter;

import static android.app.StatusBarManager.ACTION_KEYGUARD_PRIVATE_NOTIFICATIONS_CHANGED;

import static android.app.StatusBarManager.EXTRA_KM_PRIVATE_NOTIFS_ALLOWED;
@@ -88,8 +88,6 @@ import static android.content.pm.PackageManager.MATCH_ANY_USER; 
import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_AWARE;

import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_UNAWARE;

import static android.content.pm.PackageManager.PERMISSION_GRANTED;

import static android.media.audio.Flags.focusExclusiveWithRecording;

import static android.media.AudioAttributes.USAGE_NOTIFICATION_RINGTONE;

import static android.os.Flags.allowPrivateProfile;

import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_CRITICAL;

import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_NORMAL;
@@ -98,8 +96,8 @@ import static android.os.PowerWhitelistManager.TEMPORARY_ALLOWLIST_TYPE_FOREGROU 
import static android.os.UserHandle.USER_ALL;

import static android.os.UserHandle.USER_NULL;

import static android.os.UserHandle.USER_SYSTEM;

import static android.service.notification.Flags.redactSensitiveNotificationsFromUntrustedListeners;

import static android.service.notification.Flags.callstyleCallbackApi;

import static android.service.notification.Flags.redactSensitiveNotificationsFromUntrustedListeners;

import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ALERTING;

import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_CONVERSATIONS;

import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ONGOING;
@@ -139,8 +137,8 @@ import static android.service.notification.NotificationListenerService.Ranking.R 
import static android.service.notification.NotificationListenerService.Ranking.RANKING_UNCHANGED;

import static android.service.notification.NotificationListenerService.TRIM_FULL;

import static android.service.notification.NotificationListenerService.TRIM_LIGHT;

import static android.view.contentprotection.flags.Flags.rapidClearNotificationsByListenerAppOpEnabled;

import static android.view.WindowManager.LayoutParams.TYPE_TOAST;

import static android.view.contentprotection.flags.Flags.rapidClearNotificationsByListenerAppOpEnabled;















import static com.android.internal.util.FrameworkStatsLog.DND_MODE_RULE;















import static com.android.internal.util.FrameworkStatsLog.PACKAGE_NOTIFICATION_CHANNEL_GROUP_PREFERENCES;










@@ -184,7 +182,6 @@ import android.app.INotificationManager;













import android.app.ITransientNotification;















import android.app.ITransientNotificationCallback;















import android.app.IUriGrantsManager;













import android.app.KeyguardManager;















import android.app.Notification;















import android.app.Notification.MessagingStyle;















import android.app.NotificationChannel;









@@ -198,7 +195,6 @@ import android.app.Person;













import android.app.RemoteServiceException.BadForegroundServiceNotificationException;















import android.app.RemoteServiceException.BadUserInitiatedJobNotificationException;















import android.app.StatsManager;













import android.app.StatusBarManager;















import android.app.UriGrantsManager;















import android.app.admin.DevicePolicyManagerInternal;















import android.app.backup.BackupManager;










@@ -237,7 +233,6 @@ import android.content.pm.VersionedPackage;













import android.content.res.Resources;















import android.database.ContentObserver;















import android.graphics.drawable.Icon;













import android.media.AudioAttributes;















import android.metrics.LogMaker;















import android.net.Uri;















import android.os.Binder;










@@ -266,7 +261,6 @@ import android.os.SystemProperties;













import android.os.Trace;















import android.os.UserHandle;















import android.os.UserManager;













import android.os.VibrationEffect;















import android.os.WorkSource;















import android.permission.PermissionManager;















import android.provider.DeviceConfig;









@@ -292,7 +286,6 @@ import android.service.notification.ZenModeConfig;













import android.service.notification.ZenModeProto;















import android.service.notification.ZenPolicy;















import android.telecom.TelecomManager;













import android.telephony.PhoneStateListener;















import android.telephony.TelephonyManager;















import android.text.TextUtils;















import android.text.format.DateUtils;









@@ -309,7 +302,6 @@ import android.util.StatsEvent;













import android.util.Xml;















import android.util.proto.ProtoOutputStream;















import android.view.Display;













import android.view.accessibility.AccessibilityEvent;















import android.view.accessibility.AccessibilityManager;















import android.widget.RemoteViews;















import android.widget.Toast;










@@ -349,7 +341,6 @@ import com.android.server.LocalServices;













import com.android.server.SystemService;















import com.android.server.job.JobSchedulerInternal;















import com.android.server.lights.LightsManager;













import com.android.server.lights.LogicalLight;















import com.android.server.notification.GroupHelper.NotificationAttributes;















import com.android.server.notification.ManagedServices.ManagedServiceInfo;















import com.android.server.notification.ManagedServices.UserProfiles;

































services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java



+12
−2




























Original line number
Diff line number
Diff line








@@ -103,6 +103,7 @@ import static android.service.notification.NotificationListenerService.Ranking.U













import static android.view.Display.DEFAULT_DISPLAY;















import static android.view.Display.INVALID_DISPLAY;















import static android.view.WindowManager.LayoutParams.TYPE_TOAST;



























import static com.android.internal.widget.LockPatternUtils.StrongAuthTracker.STRONG_AUTH_REQUIRED_AFTER_USER_LOCKDOWN;















import static com.android.server.am.PendingIntentRecord.FLAG_ACTIVITY_SENDER;















import static com.android.server.am.PendingIntentRecord.FLAG_BROADCAST_SENDER;









@@ -112,11 +113,11 @@ import static com.android.server.notification.NotificationManagerService.DEFAULT













import static com.android.server.notification.NotificationRecordLogger.NotificationReportedEvent.NOTIFICATION_ADJUSTED;















import static com.android.server.notification.NotificationRecordLogger.NotificationReportedEvent.NOTIFICATION_POSTED;















import static com.android.server.notification.NotificationRecordLogger.NotificationReportedEvent.NOTIFICATION_UPDATED;



























import static com.google.common.collect.Iterables.getOnlyElement;















import static com.google.common.truth.Truth.assertThat;















import static com.google.common.truth.Truth.assertWithMessage;













import static java.util.Collections.emptyList;













import static java.util.Collections.singletonList;



























import static junit.framework.Assert.assertEquals;















import static junit.framework.Assert.assertFalse;















import static junit.framework.Assert.assertNotNull;









@@ -125,6 +126,7 @@ import static junit.framework.Assert.assertNull;













import static junit.framework.Assert.assertSame;















import static junit.framework.Assert.assertTrue;















import static junit.framework.Assert.fail;



























import static org.junit.Assert.assertNotEquals;















import static org.junit.Assert.assertThrows;















import static org.mockito.ArgumentMatchers.isNull;









@@ -134,6 +136,9 @@ import static org.mockito.Matchers.anyString;













import static org.mockito.Matchers.eq;















import static org.mockito.Mockito.*;



























import static java.util.Collections.emptyList;













import static java.util.Collections.singletonList;



























import android.Manifest;















import android.annotation.Nullable;















import android.annotation.SuppressLint;










@@ -238,8 +243,10 @@ import android.util.AtomicFile;













import android.util.Pair;















import android.util.Xml;















import android.widget.RemoteViews;



























import androidx.test.InstrumentationRegistry;















import androidx.test.filters.SmallTest;



























import com.android.internal.R;















import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;















import com.android.internal.config.sysui.TestableFlagResolver;










@@ -270,10 +277,13 @@ import com.android.server.uri.UriGrantsManagerInternal;













import com.android.server.utils.quota.MultiRateLimiter;















import com.android.server.wm.ActivityTaskManagerInternal;















import com.android.server.wm.WindowManagerInternal;



























import com.google.android.collect.Lists;















import com.google.common.collect.ImmutableList;



























import libcore.junit.util.compat.CoreCompatChangeRule.DisableCompatChanges;















import libcore.junit.util.compat.CoreCompatChangeRule.EnableCompatChanges;



























import org.junit.After;















import org.junit.Assert;















import org.junit.Before;