Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* changes:
  ParcelTest: use different work source for updates
  Remove test assumption of interface token layout.
This commit is contained in:
Steven Moreland
2019-07-31 20:09:44 +00:00
committed by Android (Google) Code Review
parent 615fd40982 1d28afeb64
commit baa900adda
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/tests/coretests/src/android/os/ParcelTest.java
View File

@@ -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();
}