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

Commit d3c85083 authored by Julia Tuttle's avatar Julia Tuttle Committed by Android (Google) Code Review
Browse files

Merge "Make checkstyle_hook happy" into main

parents b17fe876 6c1847b7

core/java/android/app/Notification.java

+2 −3
Original line number Diff line number Diff line
@@ -17,15 +17,14 @@ 
package android.app;















import static android.annotation.Dimension.DP;













import static android.app.Flags.evenlyDividedCallStyleActionLayout;













import static android.app.Flags.updateRankingTime;















import static android.app.admin.DevicePolicyResources.Drawables.Source.NOTIFICATION;















import static android.app.admin.DevicePolicyResources.Drawables.Style.SOLID_COLORED;















import static android.app.admin.DevicePolicyResources.Drawables.WORK_PROFILE_ICON;















import static android.app.admin.DevicePolicyResources.UNDEFINED;















import static android.graphics.drawable.Icon.TYPE_URI;















import static android.graphics.drawable.Icon.TYPE_URI_ADAPTIVE_BITMAP;













import static android.app.Flags.cleanUpSpansAndNewLines;













import static android.app.Flags.evenlyDividedCallStyleActionLayout;













import static android.app.Flags.updateRankingTime;





























import static java.util.Objects.requireNonNull;















































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



+2
−1






























Original line number
Diff line number
Diff line








@@ -66,15 +66,16 @@ import android.service.notification.StatusBarNotification;













import android.text.TextUtils;















import android.util.ArraySet;















import android.util.Log;













import android.util.TimeUtils;















import android.util.proto.ProtoOutputStream;















import android.widget.RemoteViews;





























import com.android.internal.annotations.VisibleForTesting;















import com.android.internal.logging.MetricsLogger;















import com.android.internal.logging.nano.MetricsProto.MetricsEvent;















import com.android.server.EventLogTags;















import com.android.server.LocalServices;















import com.android.server.uri.UriGrantsManagerInternal;





























import dalvik.annotation.optimization.NeverCompile;































import java.io.PrintWriter;