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

Commit 89d50616 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of atel.lnx.2.0.c1-00003. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1061546   Ib7dc8c5fca58f05ea2ff64bdd888f52001468a6f   Wifi: Implement IconnectivityManager.stub function getTe
1070951   I50473ca67f79e1c12ba6627b8d59e2b289743bf3   MSIM: Clear status counter if session failed

Change-Id: I14e4c48364cfa925cf73b3743d6d5872dbbc2643
CRs-Fixed: 1061546, 1070951
parents 06d18a5f 70a39a33

src/java/com/android/internal/telephony/ProxyController.java

+3 −0
Original line number Diff line number Diff line
@@ -509,6 +509,9 @@ public class ProxyController { 
            // Increment the sessionId as we are completing the transaction below

            // so we don't want it completed when the FINISH phase is done.

            mRadioCapabilitySessionId = mUniqueIdGenerator.getAndIncrement();



            // Reset the status counter as existing session failed

            mRadioAccessFamilyStatusCounter = 0;

            // send FINISH request with fail status and then uniqueDifferentId

            mTransactionFailed = true;

            issueFinish(mRadioCapabilitySessionId);

tests/telephonytests/src/com/android/internal/telephony/mocks/ConnectivityServiceMock.java

+5 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import static android.net.NetworkPolicyManager.RULE_ALLOW_ALL; 
import static android.net.NetworkPolicyManager.RULE_REJECT_ALL;

import static android.net.NetworkPolicyManager.RULE_REJECT_METERED;



import android.net.wifi.WifiDevice;

import android.annotation.Nullable;

import android.app.AlarmManager;

import android.app.BroadcastOptions;
@@ -622,6 +623,10 @@ public class ConnectivityServiceMock extends IConnectivityManager.Stub 
        throw new RuntimeException("not implemented");

    }



    public List<WifiDevice> getTetherConnectedSta() {

        throw new RuntimeException("not implemented");

    }



    public String[] getTetherableIfaces() {

        throw new RuntimeException("not implemented");

    }