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

Commit 802013d7 authored by Mårten Kongstad's avatar Mårten Kongstad Committed by android-build-merger
Browse files

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

am: 22f79f25

Change-Id: Id44dbec56c7355a3e67a95d452606c11da247546
parents 7866c679 22f79f25

core/java/android/content/om/OverlayInfo.java

+1 −2
Original line number Diff line number Diff line
@@ -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 */

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

+2 −2
Original line number Diff line number Diff line
@@ -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);