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

Commit 74cc5401 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Remove AppWidgetManagerInternal instance before adding to global... 

Merge "Remove AppWidgetManagerInternal instance before adding to global registry of LocalServices" am: d92149a7 am: 2adbc88c

Change-Id: I4f529c067e7ba577874c15f5910f5d085cd97e8a
parents 80eaa49d 2adbc88c

services/tests/servicestests/src/com/android/server/appwidget/AppWidgetServiceImplTest.java

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import static org.mockito.Mockito.when; 


import android.app.admin.DevicePolicyManagerInternal;

import android.appwidget.AppWidgetManager;

import android.appwidget.AppWidgetManagerInternal;

import android.appwidget.AppWidgetProviderInfo;

import android.appwidget.PendingHostUpdate;

import android.content.BroadcastReceiver;
@@ -80,6 +81,7 @@ public class AppWidgetServiceImplTest extends InstrumentationTestCase { 
        super.setUp();

        LocalServices.removeServiceForTest(DevicePolicyManagerInternal.class);

        LocalServices.removeServiceForTest(ShortcutServiceInternal.class);

        LocalServices.removeServiceForTest(AppWidgetManagerInternal.class);



        mTestContext = new TestContext();

        mPkgName = mTestContext.getOpPackageName();