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

Commit 660803cb authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Merge "Remove hidden API usage: CallQuality no-argument constructor." am: ce7d2e8f am: aa007c7e am: add0df30

Change-Id: I3b75a1f49bfa703ada01886e6be461e6a3b2ff34
parents b8109e77 add0df30

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

+10 −5
Original line number Diff line number Diff line
@@ -446,9 +446,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;
@@ -541,9 +541,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;
@@ -1704,7 +1704,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]);
@@ -2718,4 +2718,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);

    }

}