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

Commit 8cdf3bcf authored by Meng Wang's avatar Meng Wang
Browse files

Use com.android.telephony.Rlog for mainline module.

Bug: 144374158
Test: make
Merged-In: I23ec4cb2c343490ef2d45cad3baf2e7ad6f89301
Merged-In: I160a345e425666b372cfc798e8e644818478a3dc
Change-Id: I23ec4cb2c343490ef2d45cad3baf2e7ad6f89301
parent fe141b35
Loading
Loading
Loading
Loading
+2 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,8 @@ package com.android.internal.telephony;
import android.content.Context;
import android.content.Context;
import android.os.AsyncTask;
import android.os.AsyncTask;
import android.provider.BlockedNumberContract;
import android.provider.BlockedNumberContract;
import android.telephony.Rlog;

import com.android.telephony.Rlog;


/**
/**
 * An {@link AsyncTask} that notifies the Blocked number provider that emergency services were
 * An {@link AsyncTask} that notifies the Blocked number provider that emergency services were
+2 −1
Original line number Original line Diff line number Diff line
@@ -3,7 +3,8 @@ package com.android.internal.telephony;
import android.content.Context;
import android.content.Context;
import android.os.Bundle;
import android.os.Bundle;
import android.provider.BlockedNumberContract;
import android.provider.BlockedNumberContract;
import android.telephony.Rlog;

import com.android.telephony.Rlog;


/**
/**
 * {@hide} Checks for blocked phone numbers against {@link BlockedNumberContract}
 * {@hide} Checks for blocked phone numbers against {@link BlockedNumberContract}
+1 −1
Original line number Original line Diff line number Diff line
@@ -17,9 +17,9 @@
package com.android.internal.telephony;
package com.android.internal.telephony;


import android.compat.annotation.UnsupportedAppUsage;
import android.compat.annotation.UnsupportedAppUsage;
import android.telephony.Rlog;


import com.android.ims.internal.ConferenceParticipant;
import com.android.ims.internal.ConferenceParticipant;
import com.android.telephony.Rlog;


import java.util.ArrayList;
import java.util.ArrayList;
import java.util.List;
import java.util.List;
+2 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,8 @@
package com.android.internal.telephony;
package com.android.internal.telephony;


import android.compat.annotation.UnsupportedAppUsage;
import android.compat.annotation.UnsupportedAppUsage;
import android.telephony.Rlog;

import com.android.telephony.Rlog;


/**
/**
 * See also RIL_CallForwardInfo in include/telephony/ril.h
 * See also RIL_CallForwardInfo in include/telephony/ril.h
+1 −3
Original line number Original line Diff line number Diff line
@@ -25,18 +25,16 @@ import android.os.Registrant;
import android.os.RegistrantList;
import android.os.RegistrantList;
import android.telephony.PhoneNumberUtils;
import android.telephony.PhoneNumberUtils;
import android.telephony.PhoneStateListener;
import android.telephony.PhoneStateListener;
import android.telephony.Rlog;
import android.telephony.ServiceState;
import android.telephony.ServiceState;


import com.android.internal.telephony.sip.SipPhone;
import com.android.internal.telephony.sip.SipPhone;
import com.android.telephony.Rlog;


import java.util.ArrayList;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashMap;
import java.util.List;
import java.util.List;




/**
/**
 * @hide
 * @hide
 *
 *
Loading