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

Commit fb96aac2 authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Gerrit Code Review
Browse files

Merge "Add VisibleForTesting to create TelephonyRegistryTest."

parents 40381378 800a7d6d

services/core/java/com/android/server/TelephonyRegistry.java

+5 −2
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import android.telephony.TelephonyManager; 
import android.telephony.VoLteServiceState;

import android.util.LocalLog;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.app.IBatteryStats;

import com.android.internal.telephony.IOnSubscriptionsChangedListener;

import com.android.internal.telephony.IPhoneStateListener;
@@ -82,7 +83,8 @@ import java.util.NoSuchElementException; 
 * Eventually we may want to remove the notion of dummy value but for now this

 * looks like the best approach.

 */

class TelephonyRegistry extends ITelephonyRegistry.Stub {

@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)

public class TelephonyRegistry extends ITelephonyRegistry.Stub {

    private static final String TAG = "TelephonyRegistry";

    private static final boolean DBG = false; // STOPSHIP if true

    private static final boolean DBG_LOC = false; // STOPSHIP if true
@@ -324,7 +326,8 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub { 
    // calls go through a oneway interface and local calls going through a

    // handler before they get to app code.



    TelephonyRegistry(Context context) {

    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)

    public TelephonyRegistry(Context context) {

        CellLocation  location = CellLocation.getEmpty();



        mContext = context;

telephony/java/android/telephony/PhoneStateListener.java

+6 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.os.Handler; 
import android.os.Looper;

import android.os.Message;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.IPhoneStateListener;



import java.lang.ref.WeakReference;
@@ -778,8 +779,12 @@ public class PhoneStateListener { 
        }

    }



    /**

     * @hide

     */

    @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)

    @UnsupportedAppUsage

    IPhoneStateListener callback = new IPhoneStateListenerStub(this);

    public final IPhoneStateListener callback = new IPhoneStateListenerStub(this);



    private void log(String s) {

        Rlog.d(LOG_TAG, s);