Merge "Remove AppWidgetManagerInternal instance before adding to global registry of LocalServices"
This commit is contained in:
@@ -28,6 +28,7 @@ import static org.mockito.Mockito.when;
|
|||||||
|
|
||||||
import android.app.admin.DevicePolicyManagerInternal;
|
import android.app.admin.DevicePolicyManagerInternal;
|
||||||
import android.appwidget.AppWidgetManager;
|
import android.appwidget.AppWidgetManager;
|
||||||
|
import android.appwidget.AppWidgetManagerInternal;
|
||||||
import android.appwidget.AppWidgetProviderInfo;
|
import android.appwidget.AppWidgetProviderInfo;
|
||||||
import android.appwidget.PendingHostUpdate;
|
import android.appwidget.PendingHostUpdate;
|
||||||
import android.content.BroadcastReceiver;
|
import android.content.BroadcastReceiver;
|
||||||
@@ -80,6 +81,7 @@ public class AppWidgetServiceImplTest extends InstrumentationTestCase {
|
|||||||
super.setUp();
|
super.setUp();
|
||||||
LocalServices.removeServiceForTest(DevicePolicyManagerInternal.class);
|
LocalServices.removeServiceForTest(DevicePolicyManagerInternal.class);
|
||||||
LocalServices.removeServiceForTest(ShortcutServiceInternal.class);
|
LocalServices.removeServiceForTest(ShortcutServiceInternal.class);
|
||||||
|
LocalServices.removeServiceForTest(AppWidgetManagerInternal.class);
|
||||||
|
|
||||||
mTestContext = new TestContext();
|
mTestContext = new TestContext();
|
||||||
mPkgName = mTestContext.getOpPackageName();
|
mPkgName = mTestContext.getOpPackageName();
|
||||||
|
|||||||
Reference in New Issue
Block a user