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

Commit b0695493 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use FrameworkStatsLog instead of StatsLog"

parents ad820a0e e718a1a8

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

+5 −5
Original line number Diff line number Diff line
@@ -90,10 +90,10 @@ import static android.service.notification.NotificationListenerService.REASON_UN 
import static android.service.notification.NotificationListenerService.REASON_USER_STOPPED;

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

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

import static android.util.StatsLogInternal.BUBBLE_DEVELOPER_ERROR_REPORTED__ERROR__ACTIVITY_INFO_MISSING;

import static android.util.StatsLogInternal.BUBBLE_DEVELOPER_ERROR_REPORTED__ERROR__ACTIVITY_INFO_NOT_RESIZABLE;

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



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

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

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

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

import static com.android.server.am.PendingIntentRecord.FLAG_SERVICE_SENDER;
@@ -219,7 +219,6 @@ import android.util.Log; 
import android.util.Pair;

import android.util.Slog;

import android.util.SparseArray;

import android.util.StatsLog;

import android.util.Xml;

import android.util.proto.ProtoOutputStream;

import android.view.accessibility.AccessibilityEvent;
@@ -243,6 +242,7 @@ import com.android.internal.util.ArrayUtils; 
import com.android.internal.util.CollectionUtils;

import com.android.internal.util.DumpUtils;

import com.android.internal.util.FastXmlSerializer;

import com.android.internal.util.FrameworkStatsLog;

import com.android.internal.util.Preconditions;

import com.android.internal.util.XmlUtils;

import com.android.internal.util.function.TriPredicate;
@@ -5780,14 +5780,14 @@ public class NotificationManagerService extends SystemService { 
                ? intent.resolveActivityInfo(context.getPackageManager(), 0)

                : null;

        if (info == null) {

            StatsLog.write(StatsLog.BUBBLE_DEVELOPER_ERROR_REPORTED, packageName,

            FrameworkStatsLog.write(FrameworkStatsLog.BUBBLE_DEVELOPER_ERROR_REPORTED, packageName,

                    BUBBLE_DEVELOPER_ERROR_REPORTED__ERROR__ACTIVITY_INFO_MISSING);

            Log.w(TAG, "Unable to send as bubble -- couldn't find activity info for intent: "

                    + intent);

            return false;

        }

        if (!ActivityInfo.isResizeableMode(info.resizeMode)) {

            StatsLog.write(StatsLog.BUBBLE_DEVELOPER_ERROR_REPORTED, packageName,

            FrameworkStatsLog.write(FrameworkStatsLog.BUBBLE_DEVELOPER_ERROR_REPORTED, packageName,

                    BUBBLE_DEVELOPER_ERROR_REPORTED__ERROR__ACTIVITY_INFO_NOT_RESIZABLE);

            Log.w(TAG, "Unable to send as bubble -- activity is not resizable for intent: "

                    + intent);