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

Merge "Fix broken test case 'testOverlayInfoStateTransitions'" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-24 13:21:34 +00:00
committed by Android (Google) Code Review
parent e9635d80f1 c49d524b0c
commit 22f79f250c
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/content/om/OverlayInfo.java
View File

@@ -45,8 +45,7 @@ public final class OverlayInfo implements Parcelable {
STATE_DISABLED,
STATE_ENABLED,
STATE_ENABLED_STATIC,
// @Deprecated STATE_TARGET_UPGRADING,
STATE_TARGET_IS_BEING_REPLACED,
// @Deprecated STATE_TARGET_IS_BEING_REPLACED,
STATE_OVERLAY_IS_BEING_REPLACED,
})
/** @hide */

4
services/tests/servicestests/src/com/android/server/om/OverlayManagerServiceImplTests.java
View File

@@ -19,7 +19,6 @@ package com.android.server.om;
import static android.content.om.OverlayInfo.STATE_DISABLED;
import static android.content.om.OverlayInfo.STATE_ENABLED;
import static android.content.om.OverlayInfo.STATE_MISSING_TARGET;
import static android.content.om.OverlayInfo.STATE_TARGET_IS_BEING_REPLACED;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -172,8 +171,9 @@ public class OverlayManagerServiceImplTests {
mImpl.setEnabled(OVERLAY, true, USER);
assertState(STATE_ENABLED, OVERLAY, USER);
// target upgrades do not change the state of the overlay
beginUpgradeTargetPackage(TARGET, USER);
assertState(STATE_TARGET_IS_BEING_REPLACED, OVERLAY, USER);
assertState(STATE_ENABLED, OVERLAY, USER);
endUpgradeTargetPackage(TARGET, USER);
assertState(STATE_ENABLED, OVERLAY, USER);