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

Commit 953e1af6 authored by Brad Ebinger's avatar Brad Ebinger
Browse files

Switch to using android.telecom.Log in Telecom 

Sorry.

Test: All affected unit tests still pass.
Bug: 26571395
Change-Id: I890d68d935cd554ba89042e99c155757697e1a37
parent b23b8c9a

proguard.flags

+1 −1
Original line number Diff line number Diff line
@@ -3,6 +3,6 @@ 
-keep class com.android.server.telecom.TelecomSystem {

  *;

}

-keep class com.android.server.telecom.Log {

-keep class android.telecom.Log {

  *;

}

src/com/android/server/telecom/Analytics.java

+1 −2
Original line number Diff line number Diff line
@@ -16,12 +16,11 @@ 


package com.android.server.telecom;



import android.os.Parcelable;

import android.telecom.ParcelableCallAnalytics;

import android.telecom.DisconnectCause;

import android.telecom.Log;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.CallerInfo;

import com.android.internal.util.IndentingPrintWriter;



import java.util.HashMap;

src/com/android/server/telecom/AsyncRingtonePlayer.java

+3 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.net.Uri; 
import android.os.Handler;

import android.os.HandlerThread;

import android.os.Message;

import android.telecom.Log;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.os.SomeArgs;
@@ -137,8 +138,8 @@ public class AsyncRingtonePlayer { 
                Uri ringtoneUri = incomingCall.getRingtone();

                String ringtoneUriString = (ringtoneUri == null) ? "null" :

                        ringtoneUri.toSafeString();

                Log.event(null, Log.Events.ERROR_LOG, "Failed to get ringtone from factory. " +

                        "Skipping ringing. Uri was: " + ringtoneUriString);

                Log.addEvent(null, LogUtils.Events.ERROR_LOG, "Failed to get ringtone from " +

                        "factory. Skipping ringing. Uri was: " + ringtoneUriString);

                return;

            }

        }

src/com/android/server/telecom/BluetoothManager.java

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ import android.content.IntentFilter; 
import android.os.Handler;

import android.os.Looper;

import android.os.SystemClock;

import android.telecom.Log;

import android.telecom.Logging.Runnable;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.IndentingPrintWriter;

src/com/android/server/telecom/BluetoothPhoneServiceImpl.java

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.os.Binder; 
import android.os.IBinder;

import android.os.RemoteException;

import android.telecom.Connection;

import android.telecom.Log;

import android.telecom.PhoneAccount;

import android.telephony.PhoneNumberUtils;

import android.telephony.TelephonyManager;