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

Commit a2611c00 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use Log instead of Slog in QosCallbackAgentConnection" am: c0b0157d 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d5362567ab4c9f510582261ef365edfaabceaf5
parents eeb8bba5 c0b0157d

services/core/java/com/android/server/connectivity/QosCallbackAgentConnection.java

+4 −8
Original line number Original line Diff line number Diff line
@@ -27,7 +27,7 @@ import android.net.QosSession; 
import android.os.IBinder;

import android.os.IBinder;

import android.os.RemoteException;

import android.os.RemoteException;

import android.telephony.data.EpsBearerQosSessionAttributes;

import android.telephony.data.EpsBearerQosSessionAttributes;

import android.util.Slog;

import android.util.Log;





import java.util.Objects;

import java.util.Objects;
@@ -175,18 +175,14 @@ class QosCallbackAgentConnection implements IBinder.DeathRecipient { 
    }

    }





    private static void log(@NonNull final String msg) {

    private static void log(@NonNull final String msg) {

        Slog.d(TAG, msg);

        Log.d(TAG, msg);

    }

    }





    private static void logw(@NonNull final String msg) {

    private static void logw(@NonNull final String msg) {

        Slog.w(TAG, msg);

        Log.w(TAG, msg);

    }

    }





    private static void loge(@NonNull final String msg, final Throwable t) {

    private static void loge(@NonNull final String msg, final Throwable t) {

        Slog.e(TAG, msg, t);

        Log.e(TAG, msg, t);

    }



    private static void logwtf(@NonNull final String msg) {

        Slog.wtf(TAG, msg);

    }

    }

}
 
}