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

Commit ad520cf3 authored by Muhammad Qureshi's avatar Muhammad Qureshi Committed by Automerger Merge Worker
Browse files

Merge "Use annotation id @SystemApi constants in StatsLog" am: eb043b78 am:... 

Merge "Use annotation id @SystemApi constants in StatsLog" am: eb043b78 am: 59d282be am: d8d235dd am: cfc401ac

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia336f813f15ec910051251b604745ba8e2c73143
parents 31f6d3f9 cfc401ac

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

+1 −1
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ import static android.app.NotificationManager.BUBBLE_PREFERENCE_ALL; 
import static android.app.NotificationManager.BUBBLE_PREFERENCE_NONE;

import static android.app.NotificationManager.IMPORTANCE_NONE;

import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;

import static android.util.StatsLog.ANNOTATION_ID_IS_UID;



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

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

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

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

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

+1 −1
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ import static android.app.NotificationManager.AUTOMATIC_RULE_STATUS_ENABLED; 
import static android.app.NotificationManager.AUTOMATIC_RULE_STATUS_REMOVED;

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

import static android.service.notification.DNDModeProto.ROOT_CONFIG;

import static android.util.StatsLog.ANNOTATION_ID_IS_UID;



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

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



import android.app.AppOpsManager;

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

+1 −1
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ import static android.app.NotificationManager.IMPORTANCE_LOW; 
import static android.app.NotificationManager.IMPORTANCE_MAX;

import static android.app.NotificationManager.IMPORTANCE_NONE;

import static android.app.NotificationManager.IMPORTANCE_UNSPECIFIED;

import static android.util.StatsLog.ANNOTATION_ID_IS_UID;



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

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

import static com.android.os.AtomsProto.PackageNotificationChannelPreferences.CHANNEL_ID_FIELD_NUMBER;

import static com.android.os.AtomsProto.PackageNotificationChannelPreferences.CHANNEL_NAME_FIELD_NUMBER;

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

+1 −1
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_FULL_SCRE 
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_LIGHTS;

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

import static android.provider.Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;

import static android.util.StatsLog.ANNOTATION_ID_IS_UID;



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

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

import static com.android.os.AtomsProto.DNDModeProto.CHANNELS_BYPASSING_FIELD_NUMBER;

import static com.android.os.AtomsProto.DNDModeProto.ENABLED_FIELD_NUMBER;