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

Commit ce7d2e8f authored by Meng Wang's avatar Meng Wang Committed by Gerrit Code Review
Browse files

Merge "Remove hidden API usage: CallQuality no-argument constructor."

parents 79c83587 be15dbae

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

+10 −5
Original line number Diff line number Diff line
@@ -449,9 +449,9 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
            mOtaspMode[i] = TelephonyManager.OTASP_UNKNOWN;

            mCallDisconnectCause[i] = DisconnectCause.NOT_VALID;

            mCallPreciseDisconnectCause[i] = PreciseDisconnectCause.NOT_VALID;

            mCallQuality[i] = new CallQuality();

            mCallQuality[i] = createCallQuality();

            mCallAttributes[i] = new CallAttributes(new PreciseCallState(),

                    TelephonyManager.NETWORK_TYPE_UNKNOWN, new CallQuality());

                    TelephonyManager.NETWORK_TYPE_UNKNOWN, createCallQuality());

            mCallNetworkType[i] = TelephonyManager.NETWORK_TYPE_UNKNOWN;

            mPreciseCallState[i] = new PreciseCallState();

            mRingingCallState[i] = PreciseCallState.PRECISE_CALL_STATE_IDLE;
@@ -546,9 +546,9 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
            mOtaspMode[i] = TelephonyManager.OTASP_UNKNOWN;

            mCallDisconnectCause[i] = DisconnectCause.NOT_VALID;

            mCallPreciseDisconnectCause[i] = PreciseDisconnectCause.NOT_VALID;

            mCallQuality[i] = new CallQuality();

            mCallQuality[i] = createCallQuality();

            mCallAttributes[i] = new CallAttributes(new PreciseCallState(),

                    TelephonyManager.NETWORK_TYPE_UNKNOWN, new CallQuality());

                    TelephonyManager.NETWORK_TYPE_UNKNOWN, createCallQuality());

            mCallNetworkType[i] = TelephonyManager.NETWORK_TYPE_UNKNOWN;

            mPreciseCallState[i] = new PreciseCallState();

            mRingingCallState[i] = PreciseCallState.PRECISE_CALL_STATE_IDLE;
@@ -1743,7 +1743,7 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                    if (mPreciseCallState[phoneId].getForegroundCallState()

                            != PreciseCallState.PRECISE_CALL_STATE_ACTIVE) {

                        mCallNetworkType[phoneId] = TelephonyManager.NETWORK_TYPE_UNKNOWN;

                        mCallQuality[phoneId] = new CallQuality();

                        mCallQuality[phoneId] = createCallQuality();

                    }

                    mCallAttributes[phoneId] = new CallAttributes(mPreciseCallState[phoneId],

                            mCallNetworkType[phoneId], mCallQuality[phoneId]);
@@ -2757,4 +2757,9 @@ public class TelephonyRegistry extends ITelephonyRegistry.Stub { 
                return "UNKNOWN";

        }

    }



    /** Returns a new CallQuality object with default values. */

    private static CallQuality createCallQuality() {

        return new CallQuality(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);

    }

}