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

Commit baa900ad authored by Steven Moreland's avatar Steven Moreland Committed by Android (Google) Code Review
Browse files

Merge changes from topic "libbinder-bitness-header" into stage-aosp-master 

* changes:
  ParcelTest: use different work source for updates
  Remove test assumption of interface token layout.
parents 615fd409 1d28afeb

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

+6 −8
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ public class ParcelTest { 


        // WorkSource can be updated.

        p.writeInterfaceToken(INTERFACE_TOKEN_1);

        assertEquals(true, p.replaceCallingWorkSourceUid(WORK_SOURCE_1));

        assertEquals(WORK_SOURCE_1, p.readCallingWorkSourceUid());

        assertEquals(true, p.replaceCallingWorkSourceUid(WORK_SOURCE_2));

        assertEquals(WORK_SOURCE_2, p.readCallingWorkSourceUid());



        // WorkSource can be updated to unset value.

        assertEquals(true, p.replaceCallingWorkSourceUid(Binder.UNSET_WORKSOURCE));
@@ -56,18 +56,16 @@ public class ParcelTest { 
    @Test

    public void testCallingWorkSourceUidAfterEnforce() {

        Parcel p = Parcel.obtain();

        // Write headers manually so that we do not invoke #writeInterfaceToken.

        p.writeInt(1);  // strict mode header

        p.writeInt(WORK_SOURCE_1);  // worksource header.

        p.writeString(INTERFACE_TOKEN_1);  // interface token.

        p.writeInterfaceToken(INTERFACE_TOKEN_1);

        assertEquals(true, p.replaceCallingWorkSourceUid(WORK_SOURCE_1));

        p.setDataPosition(0);



        p.enforceInterface(INTERFACE_TOKEN_1);

        assertEquals(WORK_SOURCE_1, p.readCallingWorkSourceUid());



        // WorkSource can be updated.

        assertEquals(true, p.replaceCallingWorkSourceUid(WORK_SOURCE_1));

        assertEquals(WORK_SOURCE_1, p.readCallingWorkSourceUid());

        assertEquals(true, p.replaceCallingWorkSourceUid(WORK_SOURCE_2));

        assertEquals(WORK_SOURCE_2, p.readCallingWorkSourceUid());



        p.recycle();

    }