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

Commit 76210c42 authored by David Su's avatar David Su Committed by Android (Google) Code Review
Browse files

Merge "AsyncChannel: Migrate Slog to Log to enable Jarjaring"

parents 4aafce53 6cfef54b

core/java/com/android/internal/util/AsyncChannel.java

+5 −5
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import android.os.Looper; 
import android.os.Message;

import android.os.Messenger;

import android.os.RemoteException;

import android.util.Slog;

import android.util.Log;



import java.util.Stack;
@@ -841,7 +841,7 @@ public class AsyncChannel { 
                    msg.replyTo = sm.mMessenger;

                    synchronized (sm.mHandler.mLockObject) {

                        if (sm.mHandler.mResultMsg != null) {

                            Slog.wtf(TAG, "mResultMsg should be null here");

                            Log.wtf(TAG, "mResultMsg should be null here");

                            sm.mHandler.mResultMsg = null;

                        }

                        dstMessenger.send(msg);
@@ -851,9 +851,9 @@ public class AsyncChannel { 
                    }

                }

            } catch (InterruptedException e) {

                Slog.e(TAG, "error in sendMessageSynchronously", e);

                Log.e(TAG, "error in sendMessageSynchronously", e);

            } catch (RemoteException e) {

                Slog.e(TAG, "error in sendMessageSynchronously", e);

                Log.e(TAG, "error in sendMessageSynchronously", e);

            }

            sm.recycle();

            return resultMsg;
@@ -939,7 +939,7 @@ public class AsyncChannel { 
     * @param s

     */

    private static void log(String s) {

        Slog.d(TAG, s);

        Log.d(TAG, s);

    }



    private final class DeathMonitor implements IBinder.DeathRecipient {

core/java/com/android/internal/util/AsyncService.java

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import android.os.Handler; 
import android.os.IBinder;

import android.os.Message;

import android.os.Messenger;

import android.util.Slog;

import android.util.Log;



/**

 * A service that receives Intents and IBinder transactions
@@ -92,7 +92,7 @@ abstract public class AsyncService extends Service { 
     */

    @Override

    public int onStartCommand(Intent intent, int flags, int startId) {

        if (DBG) Slog.d(TAG, "onStartCommand");

        if (DBG) Log.d(TAG, "onStartCommand");



        Message msg = mHandler.obtainMessage();

        msg.what = CMD_ASYNC_SERVICE_ON_START_INTENT;
@@ -111,7 +111,7 @@ abstract public class AsyncService extends Service { 
     */

    @Override

    public void onDestroy() {

        if (DBG) Slog.d(TAG, "onDestroy");

        if (DBG) Log.d(TAG, "onDestroy");



        Message msg = mHandler.obtainMessage();

        msg.what = CMD_ASYNC_SERVICE_DESTROY;