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

Commit 2d1ce374 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 am: 74cc5401

Change-Id: I5d4270d37d8598f94d0bc59009dd6ae4a7fb718e
parents d04bce90 74cc5401

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