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

Commit 474d9ccc authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Use WorkChain.toString() instead for Mainline" am: c6a31734 am: 0fc56326 am: ae9c0118 

Change-Id: I7985131653d478e1e1e868c9807e7e506912940a
parents 3caddd2d ae9c0118

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 List<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
@@ -1693,7 +1693,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