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

Merge "WorkSource: Fix WorkSource#remove for chained worksources."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-09 08:46:22 +00:00
committed by Android (Google) Code Review
parent f802130df7 ee07f627c9
commit 7ede382ce3
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/os/WorkSource.java
View File

@@ -407,11 +407,11 @@ public class WorkSource implements Parcelable {
}
public boolean remove(WorkSource other) {
if (mNum <= 0 || other.mNum <= 0) {
if (isEmpty() || other.isEmpty()) {
return false;
}
boolean uidRemoved = false;
boolean uidRemoved;
if (mNames == null && other.mNames == null) {
uidRemoved = removeUids(other);
} else {
@@ -427,13 +427,8 @@ public class WorkSource implements Parcelable {
}
boolean chainRemoved = false;
if (other.mChains != null) {
if (mChains != null) {
chainRemoved = mChains.removeAll(other.mChains);
}
} else if (mChains != null) {
mChains.clear();
chainRemoved = true;
if (other.mChains != null && mChains != null) {
chainRemoved = mChains.removeAll(other.mChains);
}
return uidRemoved || chainRemoved;

20
core/tests/coretests/src/android/os/WorkSourceTest.java
View File

@@ -331,4 +331,24 @@ public class WorkSourceTest extends TestCase {
wc.addNode(200, "tag2");
assertEquals(100, wc.getAttributionUid());
}
public void testRemove_fromChainedWorkSource() {
WorkSource ws1 = new WorkSource();
ws1.createWorkChain().addNode(50, "foo");
ws1.createWorkChain().addNode(75, "bar");
ws1.add(100);
WorkSource ws2 = new WorkSource();
ws2.add(100);
assertTrue(ws1.remove(ws2));
assertEquals(2, ws1.getWorkChains().size());
assertEquals(50, ws1.getWorkChains().get(0).getAttributionUid());
assertEquals(75, ws1.getWorkChains().get(1).getAttributionUid());
ws2.createWorkChain().addNode(50, "foo");
assertTrue(ws1.remove(ws2));
assertEquals(1, ws1.getWorkChains().size());
assertEquals(75, ws1.getWorkChains().get(0).getAttributionUid());
}
}