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

Commit 0fc56326 authored by sqian's avatar sqian Committed by android-build-merger
Browse files

Merge "Use WorkChain.toString() instead for Mainline" 

am: c6a31734

Change-Id: I12e7bf2b0c8f08b408cb495635b3de2ee67b1597
parents 52757677 c6a31734

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

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ public class RILRequest { 
        final ArrayList<WorkChain> workChains = mWorkSource.getWorkChains();

        if (workChains != null && !workChains.isEmpty()) {

            final WorkChain workChain = workChains.get(0);

            return workChain.getAttributionUid() + ":" + workChain.getTags()[0];

            return workChain.toString();

        }



        return null;

tests/telephonytests/src/com/android/internal/telephony/RILTest.java

+1 −1
Original line number Diff line number Diff line
@@ -1688,7 +1688,7 @@ public class RILTest extends TelephonyTest { 
        ws = new WorkSource();

        ws.createWorkChain().addNode(100, "foo").addNode(200, "bar");

        request = RILRequest.obtain(0, null, ws);

        assertEquals("100:foo", request.getWorkSourceClientId());

        assertEquals("WorkChain{(100, foo), (200, bar)}", request.getWorkSourceClientId());

    }



    @Test