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

Commit e9353d38 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android (Google) Code Review
Browse files

Merge "WorkSource: Fix getAttributionUid."

parents 303f84fa cbe06778

core/java/android/os/WorkSource.java

+3 −3
Original line number Diff line number Diff line
@@ -853,11 +853,11 @@ public class WorkSource implements Parcelable { 
        }



        /**

         * Return the UID to which this WorkChain should be attributed to, i.e, the UID performing

         * the actual work.

         * Return the UID to which this WorkChain should be attributed to, i.e, the UID that

         * initiated the work and not the UID performing it.

         */

        public int getAttributionUid() {

            return mUids[mSize - 1];

            return mUids[0];

        }



        // TODO: The following three trivial getters are purely for testing and will be removed

core/tests/coretests/src/android/os/WorkSourceTest.java

+9 −0
Original line number Diff line number Diff line
@@ -322,4 +322,13 @@ public class WorkSourceTest extends TestCase { 
        assertEquals(new WorkChain().addNode(0, "tag0"), diffs[1].get(0));

        assertEquals(new WorkChain().addNode(2, "tag2"), diffs[1].get(1));

    }



    public void testGetAttributionId() {

        WorkSource ws1 = new WorkSource();

        WorkChain wc = ws1.createWorkChain();

        wc.addNode(100, "tag");

        assertEquals(100, wc.getAttributionUid());

        wc.addNode(200, "tag2");

        assertEquals(100, wc.getAttributionUid());

    }

}