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

Merge "Remove AppWidgetManagerInternal instance before adding to global registry of LocalServices"

Browse Source 
am: d92149a76a

Change-Id: Id59e0e87825e9edba1fdfb858fd7ef77dd1fd91d
This commit is contained in:
Sunny Goyal
2020-01-08 08:07:25 -08:00
committed by android-build-merger
parent bca74a47bc d92149a76a
commit 2adbc88c08
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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