Separate android.test.mock from test-runner source

Extracts the source for the android.test.mock library from the
frameworks/base/test-runner directory into its own
frameworks/base/test-mock directory. They are already treated separately
at runtime and compile time so this just makes the separation complete.

Bug: 30188076
Test: make checkbuild
Change-Id: I20e5b06ba79677e76117c82e9f9e2ecd15e5fed6

14 files changed, 8 insertions, 3744 deletions

diff --git a/test-runner/Android.mk b/test-runner/Android.mk
index 3367aba5c0f9..d0f5b3248c29 100644
--- a/test-runner/Android.mk
+++ b/test-runner/Android.mk
@@ -16,14 +16,11 @@
 
 LOCAL_PATH:= $(call my-dir)
 
-android_test_mock_source_files := $(call all-java-files-under, src/android/test/mock)
-
 # Build the android.test.runner library
 # =====================================
 include $(CLEAR_VARS)
 
-LOCAL_SRC_FILES := \
-    $(filter-out $(android_test_mock_source_files), $(call all-java-files-under, src))
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_JAVA_LIBRARIES := \
     core-oj \
@@ -42,7 +39,12 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
-LOCAL_JAVA_LIBRARIES := core-oj core-libart framework legacy-test
+LOCAL_JAVA_LIBRARIES := \
+    core-oj \
+    core-libart \
+    framework \
+    legacy-test \
+    android.test.mock \
 
 LOCAL_JARJAR_RULES := $(LOCAL_PATH)/../legacy-test/jarjar-rules.txt
 
@@ -57,10 +59,7 @@ ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))
 # ============================================================
 include $(CLEAR_VARS)
 
-# Exclude android.test.mock classes as stubs for them are created in the
-# android.test.mock.stubs target
-LOCAL_SRC_FILES := \
-    $(filter-out $(android_test_mock_source_files), $(call all-java-files-under, src))
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_JAVA_LIBRARIES := \
     core-oj \
@@ -153,117 +152,3 @@ update-android-test-runner-api: $(ANDROID_TEST_RUNNER_OUTPUT_API_FILE) | $(ACP)
 	$(hide) $(ACP) $(ANDROID_TEST_RUNNER_OUTPUT_REMOVED_API_FILE) $(ANDROID_TEST_RUNNER_REMOVED_API_FILE)
 
 endif  # not TARGET_BUILD_APPS not TARGET_BUILD_PDK=true
-
-# Build the android.test.mock library
-# ===================================
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(android_test_mock_source_files)
-
-LOCAL_JAVA_LIBRARIES := core-oj core-libart framework
-
-LOCAL_MODULE:= android.test.mock
-
-include $(BUILD_JAVA_LIBRARY)
-
-# For unbundled build we'll use the prebuilt jar from prebuilts/sdk.
-ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))
-
-# Generate the stub source files for android.test.mock.stubs
-# ==========================================================
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(android_test_mock_source_files)
-
-LOCAL_JAVA_LIBRARIES := core-oj core-libart framework
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-LOCAL_DROIDDOC_SOURCE_PATH := $(LOCAL_PATH)/src/android/test/mock
-
-ANDROID_TEST_MOCK_OUTPUT_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.mock.stubs_intermediates/api.txt
-ANDROID_TEST_MOCK_OUTPUT_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.mock.stubs_intermediates/removed.txt
-
-ANDROID_TEST_MOCK_API_FILE := $(LOCAL_PATH)/api/android-test-mock-current.txt
-ANDROID_TEST_MOCK_REMOVED_API_FILE := $(LOCAL_PATH)/api/android-test-mock-removed.txt
-
-LOCAL_DROIDDOC_OPTIONS:= \
-    -stubpackages android.test.mock \
-    -stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.mock.stubs_intermediates/src \
-    -nodocs \
-    -api $(ANDROID_TEST_MOCK_OUTPUT_API_FILE) \
-    -removedApi $(ANDROID_TEST_MOCK_OUTPUT_REMOVED_API_FILE) \
-
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_MODULE := android-test-mock-api-stubs-gen
-
-include $(BUILD_DROIDDOC)
-
-# Remember the target that will trigger the code generation.
-android_test_mock_gen_stamp := $(full_target)
-
-# Add some additional dependencies
-$(ANDROID_TEST_MOCK_OUTPUT_API_FILE): $(full_target)
-$(ANDROID_TEST_MOCK_OUTPUT_REMOVED_API_FILE): $(full_target)
-
-# Build the android.test.mock.stubs library
-# =========================================
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := android.test.mock.stubs
-
-LOCAL_SOURCE_FILES_ALL_GENERATED := true
-
-# Make sure to run droiddoc first to generate the stub source files.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(android_test_mock_gen_stamp)
-android_test_mock_gen_stamp :=
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-# Archive a copy of the classes.jar in SDK build.
-$(call dist-for-goals,sdk win_sdk,$(full_classes_jar):android.test.mock.stubs.jar)
-
-# Check that the android.test.mock.stubs library has not changed
-# ==============================================================
-
-# Check that the API we're building hasn't changed from the not-yet-released
-# SDK version.
-$(eval $(call check-api, \
-    check-android-test-mock-api-current, \
-    $(ANDROID_TEST_MOCK_API_FILE), \
-    $(ANDROID_TEST_MOCK_OUTPUT_API_FILE), \
-    $(ANDROID_TEST_MOCK_REMOVED_API_FILE), \
-    $(ANDROID_TEST_MOCK_OUTPUT_REMOVED_API_FILE), \
-    -error 2 -error 3 -error 4 -error 5 -error 6 \
-    -error 7 -error 8 -error 9 -error 10 -error 11 -error 12 -error 13 -error 14 -error 15 \
-    -error 16 -error 17 -error 18 -error 19 -error 20 -error 21 -error 23 -error 24 \
-    -error 25 -error 26 -error 27, \
-    cat $(LOCAL_PATH)/api/apicheck_msg_android_test_mock.txt, \
-    check-android-test-mock-api, \
-    $(call doc-timestamp-for,android-test-mock-api-stubs-gen) \
-    ))
-
-.PHONY: check-android-test-mock-api
-checkapi: check-android-test-mock-api
-
-.PHONY: update-android-test-mock-api
-update-api: update-android-test-mock-api
-
-update-android-test-mock-api: $(ANDROID_TEST_MOCK_OUTPUT_API_FILE) | $(ACP)
-	@echo Copying current.txt
-	$(hide) $(ACP) $(ANDROID_TEST_MOCK_OUTPUT_API_FILE) $(ANDROID_TEST_MOCK_API_FILE)
-	@echo Copying removed.txt
-	$(hide) $(ACP) $(ANDROID_TEST_MOCK_OUTPUT_REMOVED_API_FILE) $(ANDROID_TEST_MOCK_REMOVED_API_FILE)
-
-# Build the android.test.mock.sdk library
-# =======================================
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := android.test.mock.sdk
-LOCAL_SDK_VERSION := current
-
-LOCAL_STATIC_JAVA_LIBRARIES := android.test.mock.stubs
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-# additionally, build unit tests in a separate .apk
-include $(call all-makefiles-under,$(LOCAL_PATH))
-
-endif  # not TARGET_BUILD_APPS not TARGET_BUILD_PDK=true
diff --git a/test-runner/api/android-test-mock-current.txt b/test-runner/api/android-test-mock-current.txt
deleted file mode 100644
index 93bbf6c5c024..000000000000
--- a/test-runner/api/android-test-mock-current.txt
+++ /dev/null
@@ -1,414 +0,0 @@
-package android.test.mock {
-
-  public deprecated class MockApplication extends android.app.Application {
-    ctor public MockApplication();
-  }
-
-  public class MockContentProvider extends android.content.ContentProvider {
-    ctor protected MockContentProvider();
-    ctor public MockContentProvider(android.content.Context);
-    ctor public MockContentProvider(android.content.Context, java.lang.String, java.lang.String, android.content.pm.PathPermission[]);
-    method public android.content.ContentProviderResult[] applyBatch(java.util.ArrayList<android.content.ContentProviderOperation>);
-    method public int delete(android.net.Uri, java.lang.String, java.lang.String[]);
-    method public java.lang.String getType(android.net.Uri);
-    method public android.net.Uri insert(android.net.Uri, android.content.ContentValues);
-    method public boolean onCreate();
-    method public android.content.res.AssetFileDescriptor openTypedAssetFile(android.net.Uri, java.lang.String, android.os.Bundle);
-    method public android.database.Cursor query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String);
-    method public int update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]);
-  }
-
-  public class MockContentResolver extends android.content.ContentResolver {
-    ctor public MockContentResolver();
-    ctor public MockContentResolver(android.content.Context);
-    method protected android.content.IContentProvider acquireProvider(android.content.Context, java.lang.String);
-    method protected android.content.IContentProvider acquireUnstableProvider(android.content.Context, java.lang.String);
-    method public void addProvider(java.lang.String, android.content.ContentProvider);
-    method public boolean releaseProvider(android.content.IContentProvider);
-    method public boolean releaseUnstableProvider(android.content.IContentProvider);
-    method public void unstableProviderDied(android.content.IContentProvider);
-  }
-
-  public class MockContext extends android.content.Context {
-    ctor public MockContext();
-    method public boolean bindService(android.content.Intent, android.content.ServiceConnection, int);
-    method public boolean canLoadUnsafeResources();
-    method public int checkCallingOrSelfPermission(java.lang.String);
-    method public int checkCallingOrSelfUriPermission(android.net.Uri, int);
-    method public int checkCallingPermission(java.lang.String);
-    method public int checkCallingUriPermission(android.net.Uri, int);
-    method public int checkPermission(java.lang.String, int, int);
-    method public int checkPermission(java.lang.String, int, int, android.os.IBinder);
-    method public int checkSelfPermission(java.lang.String);
-    method public int checkUriPermission(android.net.Uri, int, int, int);
-    method public int checkUriPermission(android.net.Uri, java.lang.String, java.lang.String, int, int, int);
-    method public int checkUriPermission(android.net.Uri, int, int, int, android.os.IBinder);
-    method public void clearWallpaper();
-    method public android.content.Context createApplicationContext(android.content.pm.ApplicationInfo, int) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public android.content.Context createConfigurationContext(android.content.res.Configuration);
-    method public android.content.Context createContextForSplit(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public android.content.Context createCredentialProtectedStorageContext();
-    method public android.content.Context createDeviceProtectedStorageContext();
-    method public android.content.Context createDisplayContext(android.view.Display);
-    method public android.content.Context createPackageContext(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public android.content.Context createPackageContextAsUser(java.lang.String, int, android.os.UserHandle) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public java.lang.String[] databaseList();
-    method public boolean deleteDatabase(java.lang.String);
-    method public boolean deleteFile(java.lang.String);
-    method public boolean deleteSharedPreferences(java.lang.String);
-    method public void enforceCallingOrSelfPermission(java.lang.String, java.lang.String);
-    method public void enforceCallingOrSelfUriPermission(android.net.Uri, int, java.lang.String);
-    method public void enforceCallingPermission(java.lang.String, java.lang.String);
-    method public void enforceCallingUriPermission(android.net.Uri, int, java.lang.String);
-    method public void enforcePermission(java.lang.String, int, int, java.lang.String);
-    method public void enforceUriPermission(android.net.Uri, int, int, int, java.lang.String);
-    method public void enforceUriPermission(android.net.Uri, java.lang.String, java.lang.String, int, int, int, java.lang.String);
-    method public java.lang.String[] fileList();
-    method public android.content.Context getApplicationContext();
-    method public android.content.pm.ApplicationInfo getApplicationInfo();
-    method public android.content.res.AssetManager getAssets();
-    method public java.lang.String getBasePackageName();
-    method public java.io.File getCacheDir();
-    method public java.lang.ClassLoader getClassLoader();
-    method public java.io.File getCodeCacheDir();
-    method public android.content.ContentResolver getContentResolver();
-    method public java.io.File getDataDir();
-    method public java.io.File getDatabasePath(java.lang.String);
-    method public java.io.File getDir(java.lang.String, int);
-    method public android.view.Display getDisplay();
-    method public android.view.DisplayAdjustments getDisplayAdjustments(int);
-    method public java.io.File getExternalCacheDir();
-    method public java.io.File[] getExternalCacheDirs();
-    method public java.io.File getExternalFilesDir(java.lang.String);
-    method public java.io.File[] getExternalFilesDirs(java.lang.String);
-    method public java.io.File[] getExternalMediaDirs();
-    method public java.io.File getFileStreamPath(java.lang.String);
-    method public java.io.File getFilesDir();
-    method public android.os.Looper getMainLooper();
-    method public java.io.File getNoBackupFilesDir();
-    method public java.io.File getObbDir();
-    method public java.io.File[] getObbDirs();
-    method public java.lang.String getOpPackageName();
-    method public java.lang.String getPackageCodePath();
-    method public android.content.pm.PackageManager getPackageManager();
-    method public java.lang.String getPackageName();
-    method public java.lang.String getPackageResourcePath();
-    method public java.io.File getPreloadsFileCache();
-    method public android.content.res.Resources getResources();
-    method public android.content.SharedPreferences getSharedPreferences(java.lang.String, int);
-    method public android.content.SharedPreferences getSharedPreferences(java.io.File, int);
-    method public java.io.File getSharedPreferencesPath(java.lang.String);
-    method public java.lang.Object getSystemService(java.lang.String);
-    method public java.lang.String getSystemServiceName(java.lang.Class<?>);
-    method public android.content.res.Resources.Theme getTheme();
-    method public int getUserId();
-    method public android.graphics.drawable.Drawable getWallpaper();
-    method public int getWallpaperDesiredMinimumHeight();
-    method public int getWallpaperDesiredMinimumWidth();
-    method public void grantUriPermission(java.lang.String, android.net.Uri, int);
-    method public boolean isCredentialProtectedStorage();
-    method public boolean isDeviceProtectedStorage();
-    method public boolean moveDatabaseFrom(android.content.Context, java.lang.String);
-    method public boolean moveSharedPreferencesFrom(android.content.Context, java.lang.String);
-    method public java.io.FileInputStream openFileInput(java.lang.String) throws java.io.FileNotFoundException;
-    method public java.io.FileOutputStream openFileOutput(java.lang.String, int) throws java.io.FileNotFoundException;
-    method public android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory);
-    method public android.database.sqlite.SQLiteDatabase openOrCreateDatabase(java.lang.String, int, android.database.sqlite.SQLiteDatabase.CursorFactory, android.database.DatabaseErrorHandler);
-    method public android.graphics.drawable.Drawable peekWallpaper();
-    method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter);
-    method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, int);
-    method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler);
-    method public android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, java.lang.String, android.os.Handler, int);
-    method public android.content.Intent registerReceiverAsUser(android.content.BroadcastReceiver, android.os.UserHandle, android.content.IntentFilter, java.lang.String, android.os.Handler);
-    method public void reloadSharedPreferences();
-    method public void removeStickyBroadcast(android.content.Intent);
-    method public void removeStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);
-    method public void revokeUriPermission(android.net.Uri, int);
-    method public void revokeUriPermission(java.lang.String, android.net.Uri, int);
-    method public void sendBroadcast(android.content.Intent);
-    method public void sendBroadcast(android.content.Intent, java.lang.String);
-    method public void sendBroadcast(android.content.Intent, java.lang.String, android.os.Bundle);
-    method public void sendBroadcast(android.content.Intent, java.lang.String, int);
-    method public void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle);
-    method public void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String);
-    method public void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String, android.os.Bundle);
-    method public void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String, int);
-    method public void sendBroadcastMultiplePermissions(android.content.Intent, java.lang.String[]);
-    method public void sendOrderedBroadcast(android.content.Intent, java.lang.String);
-    method public void sendOrderedBroadcast(android.content.Intent, java.lang.String, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);
-    method public void sendOrderedBroadcast(android.content.Intent, java.lang.String, android.os.Bundle, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);
-    method public void sendOrderedBroadcast(android.content.Intent, java.lang.String, int, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);
-    method public void sendOrderedBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);
-    method public void sendOrderedBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String, int, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);
-    method public void sendOrderedBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String, int, android.os.Bundle, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);
-    method public void sendStickyBroadcast(android.content.Intent);
-    method public void sendStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle);
-    method public void sendStickyBroadcastAsUser(android.content.Intent, android.os.UserHandle, android.os.Bundle);
-    method public void sendStickyOrderedBroadcast(android.content.Intent, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);
-    method public void sendStickyOrderedBroadcastAsUser(android.content.Intent, android.os.UserHandle, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);
-    method public void setTheme(int);
-    method public void setWallpaper(android.graphics.Bitmap) throws java.io.IOException;
-    method public void setWallpaper(java.io.InputStream) throws java.io.IOException;
-    method public void startActivities(android.content.Intent[]);
-    method public void startActivities(android.content.Intent[], android.os.Bundle);
-    method public void startActivity(android.content.Intent);
-    method public void startActivity(android.content.Intent, android.os.Bundle);
-    method public android.content.ComponentName startForegroundService(android.content.Intent);
-    method public android.content.ComponentName startForegroundServiceAsUser(android.content.Intent, android.os.UserHandle);
-    method public boolean startInstrumentation(android.content.ComponentName, java.lang.String, android.os.Bundle);
-    method public void startIntentSender(android.content.IntentSender, android.content.Intent, int, int, int) throws android.content.IntentSender.SendIntentException;
-    method public void startIntentSender(android.content.IntentSender, android.content.Intent, int, int, int, android.os.Bundle) throws android.content.IntentSender.SendIntentException;
-    method public android.content.ComponentName startService(android.content.Intent);
-    method public android.content.ComponentName startServiceAsUser(android.content.Intent, android.os.UserHandle);
-    method public boolean stopService(android.content.Intent);
-    method public boolean stopServiceAsUser(android.content.Intent, android.os.UserHandle);
-    method public void unbindService(android.content.ServiceConnection);
-    method public void unregisterReceiver(android.content.BroadcastReceiver);
-    method public void updateDisplay(int);
-  }
-
-  public deprecated class MockCursor implements android.database.Cursor {
-    ctor public MockCursor();
-    method public void close();
-    method public void copyStringToBuffer(int, android.database.CharArrayBuffer);
-    method public deprecated void deactivate();
-    method public byte[] getBlob(int);
-    method public int getColumnCount();
-    method public int getColumnIndex(java.lang.String);
-    method public int getColumnIndexOrThrow(java.lang.String);
-    method public java.lang.String getColumnName(int);
-    method public java.lang.String[] getColumnNames();
-    method public int getCount();
-    method public double getDouble(int);
-    method public android.os.Bundle getExtras();
-    method public float getFloat(int);
-    method public int getInt(int);
-    method public long getLong(int);
-    method public android.net.Uri getNotificationUri();
-    method public int getPosition();
-    method public short getShort(int);
-    method public java.lang.String getString(int);
-    method public int getType(int);
-    method public boolean getWantsAllOnMoveCalls();
-    method public boolean isAfterLast();
-    method public boolean isBeforeFirst();
-    method public boolean isClosed();
-    method public boolean isFirst();
-    method public boolean isLast();
-    method public boolean isNull(int);
-    method public boolean move(int);
-    method public boolean moveToFirst();
-    method public boolean moveToLast();
-    method public boolean moveToNext();
-    method public boolean moveToPosition(int);
-    method public boolean moveToPrevious();
-    method public void registerContentObserver(android.database.ContentObserver);
-    method public void registerDataSetObserver(android.database.DataSetObserver);
-    method public deprecated boolean requery();
-    method public android.os.Bundle respond(android.os.Bundle);
-    method public void setExtras(android.os.Bundle);
-    method public void setNotificationUri(android.content.ContentResolver, android.net.Uri);
-    method public void unregisterContentObserver(android.database.ContentObserver);
-    method public void unregisterDataSetObserver(android.database.DataSetObserver);
-  }
-
-  public deprecated class MockDialogInterface implements android.content.DialogInterface {
-    ctor public MockDialogInterface();
-    method public void cancel();
-    method public void dismiss();
-  }
-
-  public deprecated class MockPackageManager extends android.content.pm.PackageManager {
-    ctor public MockPackageManager();
-    method public void addCrossProfileIntentFilter(android.content.IntentFilter, int, int, int);
-    method public void addOnPermissionsChangeListener(android.content.pm.PackageManager.OnPermissionsChangedListener);
-    method public void addPackageToPreferred(java.lang.String);
-    method public boolean addPermission(android.content.pm.PermissionInfo);
-    method public boolean addPermissionAsync(android.content.pm.PermissionInfo);
-    method public void addPreferredActivity(android.content.IntentFilter, int, android.content.ComponentName[], android.content.ComponentName);
-    method public boolean canRequestPackageInstalls();
-    method public java.lang.String[] canonicalToCurrentPackageNames(java.lang.String[]);
-    method public int checkPermission(java.lang.String, java.lang.String);
-    method public int checkSignatures(java.lang.String, java.lang.String);
-    method public int checkSignatures(int, int);
-    method public void clearApplicationUserData(java.lang.String, android.content.pm.IPackageDataObserver);
-    method public void clearCrossProfileIntentFilters(int);
-    method public void clearInstantAppCookie();
-    method public void clearPackagePreferredActivities(java.lang.String);
-    method public java.lang.String[] currentToCanonicalPackageNames(java.lang.String[]);
-    method public void deleteApplicationCacheFiles(java.lang.String, android.content.pm.IPackageDataObserver);
-    method public void deleteApplicationCacheFilesAsUser(java.lang.String, int, android.content.pm.IPackageDataObserver);
-    method public void deletePackage(java.lang.String, android.content.pm.IPackageDeleteObserver, int);
-    method public void deletePackageAsUser(java.lang.String, android.content.pm.IPackageDeleteObserver, int, int);
-    method public void extendVerificationTimeout(int, int, long);
-    method public void flushPackageRestrictionsAsUser(int);
-    method public void freeStorage(java.lang.String, long, android.content.IntentSender);
-    method public void freeStorageAndNotify(java.lang.String, long, android.content.pm.IPackageDataObserver);
-    method public android.graphics.drawable.Drawable getActivityBanner(android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public android.graphics.drawable.Drawable getActivityBanner(android.content.Intent) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public android.graphics.drawable.Drawable getActivityIcon(android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public android.graphics.drawable.Drawable getActivityIcon(android.content.Intent) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public android.content.pm.ActivityInfo getActivityInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public android.graphics.drawable.Drawable getActivityLogo(android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public android.graphics.drawable.Drawable getActivityLogo(android.content.Intent) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public java.util.List<android.content.IntentFilter> getAllIntentFilters(java.lang.String);
-    method public java.util.List<android.content.pm.PermissionGroupInfo> getAllPermissionGroups(int);
-    method public android.graphics.drawable.Drawable getApplicationBanner(android.content.pm.ApplicationInfo);
-    method public android.graphics.drawable.Drawable getApplicationBanner(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public int getApplicationEnabledSetting(java.lang.String);
-    method public boolean getApplicationHiddenSettingAsUser(java.lang.String, android.os.UserHandle);
-    method public android.graphics.drawable.Drawable getApplicationIcon(android.content.pm.ApplicationInfo);
-    method public android.graphics.drawable.Drawable getApplicationIcon(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public android.content.pm.ApplicationInfo getApplicationInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public android.content.pm.ApplicationInfo getApplicationInfoAsUser(java.lang.String, int, int) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public java.lang.CharSequence getApplicationLabel(android.content.pm.ApplicationInfo);
-    method public android.graphics.drawable.Drawable getApplicationLogo(android.content.pm.ApplicationInfo);
-    method public android.graphics.drawable.Drawable getApplicationLogo(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public android.content.pm.ChangedPackages getChangedPackages(int);
-    method public int getComponentEnabledSetting(android.content.ComponentName);
-    method public android.graphics.drawable.Drawable getDefaultActivityIcon();
-    method public java.lang.String getDefaultBrowserPackageNameAsUser(int);
-    method public android.graphics.drawable.Drawable getDrawable(java.lang.String, int, android.content.pm.ApplicationInfo);
-    method public android.content.ComponentName getHomeActivities(java.util.List<android.content.pm.ResolveInfo>);
-    method public int getInstallReason(java.lang.String, android.os.UserHandle);
-    method public java.util.List<android.content.pm.ApplicationInfo> getInstalledApplications(int);
-    method public java.util.List<android.content.pm.ApplicationInfo> getInstalledApplicationsAsUser(int, int);
-    method public java.util.List<android.content.pm.PackageInfo> getInstalledPackages(int);
-    method public java.util.List<android.content.pm.PackageInfo> getInstalledPackagesAsUser(int, int);
-    method public java.lang.String getInstallerPackageName(java.lang.String);
-    method public java.lang.String getInstantAppAndroidId(java.lang.String, android.os.UserHandle);
-    method public byte[] getInstantAppCookie();
-    method public int getInstantAppCookieMaxBytes();
-    method public int getInstantAppCookieMaxSize();
-    method public android.graphics.drawable.Drawable getInstantAppIcon(java.lang.String);
-    method public android.content.ComponentName getInstantAppInstallerComponent();
-    method public android.content.ComponentName getInstantAppResolverSettingsComponent();
-    method public java.util.List<android.content.pm.InstantAppInfo> getInstantApps();
-    method public android.content.pm.InstrumentationInfo getInstrumentationInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public java.util.List<android.content.pm.IntentFilterVerificationInfo> getIntentFilterVerifications(java.lang.String);
-    method public int getIntentVerificationStatusAsUser(java.lang.String, int);
-    method public android.content.pm.KeySet getKeySetByAlias(java.lang.String, java.lang.String);
-    method public android.content.Intent getLaunchIntentForPackage(java.lang.String);
-    method public android.content.Intent getLeanbackLaunchIntentForPackage(java.lang.String);
-    method public int getMoveStatus(int);
-    method public java.lang.String getNameForUid(int);
-    method public java.lang.String[] getNamesForUids(int[]);
-    method public java.util.List<android.os.storage.VolumeInfo> getPackageCandidateVolumes(android.content.pm.ApplicationInfo);
-    method public android.os.storage.VolumeInfo getPackageCurrentVolume(android.content.pm.ApplicationInfo);
-    method public int[] getPackageGids(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public int[] getPackageGids(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public android.content.pm.PackageInfo getPackageInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public android.content.pm.PackageInfo getPackageInfo(android.content.pm.VersionedPackage, int) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public android.content.pm.PackageInfo getPackageInfoAsUser(java.lang.String, int, int) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public android.content.pm.PackageInstaller getPackageInstaller();
-    method public void getPackageSizeInfoAsUser(java.lang.String, int, android.content.pm.IPackageStatsObserver);
-    method public int getPackageUid(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public int getPackageUidAsUser(java.lang.String, int, int) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public int getPackageUidAsUser(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public java.lang.String[] getPackagesForUid(int);
-    method public java.util.List<android.content.pm.PackageInfo> getPackagesHoldingPermissions(java.lang.String[], int);
-    method public java.lang.String getPermissionControllerPackageName();
-    method public int getPermissionFlags(java.lang.String, java.lang.String, android.os.UserHandle);
-    method public android.content.pm.PermissionGroupInfo getPermissionGroupInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public android.content.pm.PermissionInfo getPermissionInfo(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public int getPreferredActivities(java.util.List<android.content.IntentFilter>, java.util.List<android.content.ComponentName>, java.lang.String);
-    method public java.util.List<android.content.pm.PackageInfo> getPreferredPackages(int);
-    method public java.util.List<android.os.storage.VolumeInfo> getPrimaryStorageCandidateVolumes();
-    method public android.os.storage.VolumeInfo getPrimaryStorageCurrentVolume();
-    method public android.content.pm.ProviderInfo getProviderInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public android.content.pm.ActivityInfo getReceiverInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public android.content.res.Resources getResourcesForActivity(android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public android.content.res.Resources getResourcesForApplication(android.content.pm.ApplicationInfo);
-    method public android.content.res.Resources getResourcesForApplication(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public android.content.res.Resources getResourcesForApplicationAsUser(java.lang.String, int);
-    method public android.content.pm.ServiceInfo getServiceInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public java.lang.String getServicesSystemSharedLibraryPackageName();
-    method public java.util.List<android.content.pm.SharedLibraryInfo> getSharedLibraries(int);
-    method public java.util.List<android.content.pm.SharedLibraryInfo> getSharedLibrariesAsUser(int, int);
-    method public java.lang.String getSharedSystemSharedLibraryPackageName();
-    method public android.content.pm.KeySet getSigningKeySet(java.lang.String);
-    method public android.content.pm.FeatureInfo[] getSystemAvailableFeatures();
-    method public java.lang.String[] getSystemSharedLibraryNames();
-    method public java.lang.CharSequence getText(java.lang.String, int, android.content.pm.ApplicationInfo);
-    method public int getUidForSharedUser(java.lang.String);
-    method public android.graphics.drawable.Drawable getUserBadgeForDensity(android.os.UserHandle, int);
-    method public android.graphics.drawable.Drawable getUserBadgeForDensityNoBackground(android.os.UserHandle, int);
-    method public android.graphics.drawable.Drawable getUserBadgedDrawableForDensity(android.graphics.drawable.Drawable, android.os.UserHandle, android.graphics.Rect, int);
-    method public android.graphics.drawable.Drawable getUserBadgedIcon(android.graphics.drawable.Drawable, android.os.UserHandle);
-    method public java.lang.CharSequence getUserBadgedLabel(java.lang.CharSequence, android.os.UserHandle);
-    method public android.content.pm.VerifierDeviceIdentity getVerifierDeviceIdentity();
-    method public android.content.res.XmlResourceParser getXml(java.lang.String, int, android.content.pm.ApplicationInfo);
-    method public void grantRuntimePermission(java.lang.String, java.lang.String, android.os.UserHandle);
-    method public boolean hasSystemFeature(java.lang.String);
-    method public boolean hasSystemFeature(java.lang.String, int);
-    method public int installExistingPackage(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public int installExistingPackage(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public int installExistingPackageAsUser(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public void installPackage(android.net.Uri, android.content.pm.IPackageInstallObserver, int, java.lang.String);
-    method public void installPackage(android.net.Uri, android.app.PackageInstallObserver, int, java.lang.String);
-    method public boolean isInstantApp();
-    method public boolean isInstantApp(java.lang.String);
-    method public boolean isPackageAvailable(java.lang.String);
-    method public boolean isPackageSuspendedForUser(java.lang.String, int);
-    method public boolean isPermissionReviewModeEnabled();
-    method public boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);
-    method public boolean isSafeMode();
-    method public boolean isSignedBy(java.lang.String, android.content.pm.KeySet);
-    method public boolean isSignedByExactly(java.lang.String, android.content.pm.KeySet);
-    method public boolean isUpgrade();
-    method public android.graphics.drawable.Drawable loadItemIcon(android.content.pm.PackageItemInfo, android.content.pm.ApplicationInfo);
-    method public android.graphics.drawable.Drawable loadUnbadgedItemIcon(android.content.pm.PackageItemInfo, android.content.pm.ApplicationInfo);
-    method public int movePackage(java.lang.String, android.os.storage.VolumeInfo);
-    method public int movePrimaryStorage(android.os.storage.VolumeInfo);
-    method public java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int);
-    method public java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceiversAsUser(android.content.Intent, int, int);
-    method public java.util.List<android.content.pm.ProviderInfo> queryContentProviders(java.lang.String, int, int);
-    method public java.util.List<android.content.pm.InstrumentationInfo> queryInstrumentation(java.lang.String, int);
-    method public java.util.List<android.content.pm.ResolveInfo> queryIntentActivities(android.content.Intent, int);
-    method public java.util.List<android.content.pm.ResolveInfo> queryIntentActivitiesAsUser(android.content.Intent, int, int);
-    method public java.util.List<android.content.pm.ResolveInfo> queryIntentActivityOptions(android.content.ComponentName, android.content.Intent[], android.content.Intent, int);
-    method public java.util.List<android.content.pm.ResolveInfo> queryIntentContentProviders(android.content.Intent, int);
-    method public java.util.List<android.content.pm.ResolveInfo> queryIntentContentProvidersAsUser(android.content.Intent, int, int);
-    method public java.util.List<android.content.pm.ResolveInfo> queryIntentServices(android.content.Intent, int);
-    method public java.util.List<android.content.pm.ResolveInfo> queryIntentServicesAsUser(android.content.Intent, int, int);
-    method public java.util.List<android.content.pm.PermissionInfo> queryPermissionsByGroup(java.lang.String, int) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public void registerDexModule(java.lang.String, android.content.pm.PackageManager.DexModuleRegisterCallback);
-    method public void registerMoveCallback(android.content.pm.PackageManager.MoveCallback, android.os.Handler);
-    method public void removeOnPermissionsChangeListener(android.content.pm.PackageManager.OnPermissionsChangedListener);
-    method public void removePackageFromPreferred(java.lang.String);
-    method public void removePermission(java.lang.String);
-    method public void replacePreferredActivity(android.content.IntentFilter, int, android.content.ComponentName[], android.content.ComponentName);
-    method public android.content.pm.ResolveInfo resolveActivity(android.content.Intent, int);
-    method public android.content.pm.ResolveInfo resolveActivityAsUser(android.content.Intent, int, int);
-    method public android.content.pm.ProviderInfo resolveContentProvider(java.lang.String, int);
-    method public android.content.pm.ProviderInfo resolveContentProviderAsUser(java.lang.String, int, int);
-    method public android.content.pm.ResolveInfo resolveService(android.content.Intent, int);
-    method public void revokeRuntimePermission(java.lang.String, java.lang.String, android.os.UserHandle);
-    method public void setApplicationCategoryHint(java.lang.String, int);
-    method public void setApplicationEnabledSetting(java.lang.String, int, int);
-    method public boolean setApplicationHiddenSettingAsUser(java.lang.String, boolean, android.os.UserHandle);
-    method public void setComponentEnabledSetting(android.content.ComponentName, int, int);
-    method public boolean setDefaultBrowserPackageNameAsUser(java.lang.String, int);
-    method public void setInstallerPackageName(java.lang.String, java.lang.String);
-    method public boolean setInstantAppCookie(byte[]);
-    method public java.lang.String[] setPackagesSuspendedAsUser(java.lang.String[], boolean, int);
-    method public void setUpdateAvailable(java.lang.String, boolean);
-    method public boolean shouldShowRequestPermissionRationale(java.lang.String);
-    method public void unregisterMoveCallback(android.content.pm.PackageManager.MoveCallback);
-    method public void updateInstantAppCookie(byte[]);
-    method public boolean updateIntentVerificationStatusAsUser(java.lang.String, int, int);
-    method public void updatePermissionFlags(java.lang.String, java.lang.String, int, int, android.os.UserHandle);
-    method public void verifyIntentFilter(int, int, java.util.List<java.lang.String>);
-    method public void verifyPendingInstall(int, int);
-  }
-
-  public deprecated class MockResources extends android.content.res.Resources {
-    ctor public MockResources();
-    method public int getColor(int) throws android.content.res.Resources.NotFoundException;
-    method public android.content.res.ColorStateList getColorStateList(int) throws android.content.res.Resources.NotFoundException;
-    method public android.graphics.drawable.Drawable getDrawable(int) throws android.content.res.Resources.NotFoundException;
-    method public void updateConfiguration(android.content.res.Configuration, android.util.DisplayMetrics);
-  }
-
-}
-
diff --git a/test-runner/api/android-test-mock-removed.txt b/test-runner/api/android-test-mock-removed.txt
deleted file mode 100644
index 9920f63d1632..000000000000
--- a/test-runner/api/android-test-mock-removed.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-package android.test.mock {
-
-  public deprecated class MockPackageManager extends android.content.pm.PackageManager {
-    method public deprecated java.lang.String getDefaultBrowserPackageName(int);
-    method public deprecated boolean setDefaultBrowserPackageName(java.lang.String, int);
-  }
-
-}
-
diff --git a/test-runner/api/apicheck_msg_android_test_mock.txt b/test-runner/api/apicheck_msg_android_test_mock.txt
deleted file mode 100644
index e388935bf798..000000000000
--- a/test-runner/api/apicheck_msg_android_test_mock.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-
-******************************
-You have tried to change the API from what has been previously approved.
-
-To make these errors go away, you have two choices:
-   1) You can add "@hide" javadoc comments to the methods, etc. listed in the
-      errors above.
-
-   2) You can update android-test-mock-current.txt by executing the following command:
-         make update-android-test-mock-api
-
-      To submit the revised android-test-mock-current.txt to the main Android repository,
-      you will need approval.
-******************************
-
-
-
diff --git a/test-runner/src/android/test/mock/MockApplication.java b/test-runner/src/android/test/mock/MockApplication.java
deleted file mode 100644
index 3257ecf11066..000000000000
--- a/test-runner/src/android/test/mock/MockApplication.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.test.mock;
-
-import android.app.Application;
-import android.content.res.Configuration;
-
-/**
- * A mock {@link android.app.Application} class.  All methods are non-functional and throw
- * {@link java.lang.UnsupportedOperationException}.  Override it as necessary to provide the
- * operations that you need.
- *
- * @deprecated Use a mocking framework like <a href="https://github.com/mockito/mockito">Mockito</a>.
- * New tests should be written using the
- * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
- */
-@Deprecated
-public class MockApplication extends Application {
-
-    public MockApplication() {
-    }
-
-    @Override
-    public void onCreate() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void onTerminate() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/test-runner/src/android/test/mock/MockContentProvider.java b/test-runner/src/android/test/mock/MockContentProvider.java
deleted file mode 100644
index d5f3ce880b8f..000000000000
--- a/test-runner/src/android/test/mock/MockContentProvider.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.test.mock;
-
-import android.annotation.Nullable;
-import android.content.ContentProvider;
-import android.content.ContentProviderOperation;
-import android.content.ContentProviderResult;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.IContentProvider;
-import android.content.OperationApplicationException;
-import android.content.pm.PathPermission;
-import android.content.pm.ProviderInfo;
-import android.content.res.AssetFileDescriptor;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.os.ICancellationSignal;
-import android.os.ParcelFileDescriptor;
-import android.os.RemoteException;
-
-import java.io.FileNotFoundException;
-import java.util.ArrayList;
-
-/**
- * Mock implementation of ContentProvider.  All methods are non-functional and throw
- * {@link java.lang.UnsupportedOperationException}.  Tests can extend this class to
- * implement behavior needed for tests.
- */
-public class MockContentProvider extends ContentProvider {
-    /*
-     * Note: if you add methods to ContentProvider, you must add similar methods to
-     *       MockContentProvider.
-     */
-
-    /**
-     * IContentProvider that directs all calls to this MockContentProvider.
-     */
-    private class InversionIContentProvider implements IContentProvider {
-        @Override
-        public ContentProviderResult[] applyBatch(String callingPackage,
-                ArrayList<ContentProviderOperation> operations)
-                throws RemoteException, OperationApplicationException {
-            return MockContentProvider.this.applyBatch(operations);
-        }
-
-        @Override
-        public int bulkInsert(String callingPackage, Uri url, ContentValues[] initialValues)
-                throws RemoteException {
-            return MockContentProvider.this.bulkInsert(url, initialValues);
-        }
-
-        @Override
-        public int delete(String callingPackage, Uri url, String selection, String[] selectionArgs)
-                throws RemoteException {
-            return MockContentProvider.this.delete(url, selection, selectionArgs);
-        }
-
-        @Override
-        public String getType(Uri url) throws RemoteException {
-            return MockContentProvider.this.getType(url);
-        }
-
-        @Override
-        public Uri insert(String callingPackage, Uri url, ContentValues initialValues)
-                throws RemoteException {
-            return MockContentProvider.this.insert(url, initialValues);
-        }
-
-        @Override
-        public AssetFileDescriptor openAssetFile(
-                String callingPackage, Uri url, String mode, ICancellationSignal signal)
-                throws RemoteException, FileNotFoundException {
-            return MockContentProvider.this.openAssetFile(url, mode);
-        }
-
-        @Override
-        public ParcelFileDescriptor openFile(
-                String callingPackage, Uri url, String mode, ICancellationSignal signal,
-                IBinder callerToken) throws RemoteException, FileNotFoundException {
-            return MockContentProvider.this.openFile(url, mode);
-        }
-
-        @Override
-        public Cursor query(String callingPackage, Uri url, @Nullable String[] projection,
-                @Nullable Bundle queryArgs,
-                @Nullable ICancellationSignal cancellationSignal)
-                throws RemoteException {
-            return MockContentProvider.this.query(url, projection, queryArgs, null);
-        }
-
-        @Override
-        public int update(String callingPackage, Uri url, ContentValues values, String selection,
-                String[] selectionArgs) throws RemoteException {
-            return MockContentProvider.this.update(url, values, selection, selectionArgs);
-        }
-
-        @Override
-        public Bundle call(String callingPackage, String method, String request, Bundle args)
-                throws RemoteException {
-            return MockContentProvider.this.call(method, request, args);
-        }
-
-        @Override
-        public IBinder asBinder() {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public String[] getStreamTypes(Uri url, String mimeTypeFilter) throws RemoteException {
-            return MockContentProvider.this.getStreamTypes(url, mimeTypeFilter);
-        }
-
-        @Override
-        public AssetFileDescriptor openTypedAssetFile(String callingPackage, Uri url,
-                String mimeType, Bundle opts, ICancellationSignal signal)
-                throws RemoteException, FileNotFoundException {
-            return MockContentProvider.this.openTypedAssetFile(url, mimeType, opts);
-        }
-
-        @Override
-        public ICancellationSignal createCancellationSignal() throws RemoteException {
-            return null;
-        }
-
-        @Override
-        public Uri canonicalize(String callingPkg, Uri uri) throws RemoteException {
-            return MockContentProvider.this.canonicalize(uri);
-        }
-
-        @Override
-        public Uri uncanonicalize(String callingPkg, Uri uri) throws RemoteException {
-            return MockContentProvider.this.uncanonicalize(uri);
-        }
-
-        @Override
-        public boolean refresh(String callingPkg, Uri url, Bundle args,
-                ICancellationSignal cancellationSignal) throws RemoteException {
-            return MockContentProvider.this.refresh(url, args);
-        }
-    }
-    private final InversionIContentProvider mIContentProvider = new InversionIContentProvider();
-
-    /**
-     * A constructor using {@link MockContext} instance as a Context in it.
-     */
-    protected MockContentProvider() {
-        super(new MockContext(), "", "", null);
-    }
-
-    /**
-     * A constructor accepting a Context instance, which is supposed to be the subclasss of
-     * {@link MockContext}.
-     */
-    public MockContentProvider(Context context) {
-        super(context, "", "", null);
-    }
-
-    /**
-     * A constructor which initialize four member variables which
-     * {@link android.content.ContentProvider} have internally.
-     *
-     * @param context A Context object which should be some mock instance (like the
-     * instance of {@link android.test.mock.MockContext}).
-     * @param readPermission The read permision you want this instance should have in the
-     * test, which is available via {@link #getReadPermission()}.
-     * @param writePermission The write permission you want this instance should have
-     * in the test, which is available via {@link #getWritePermission()}.
-     * @param pathPermissions The PathPermissions you want this instance should have
-     * in the test, which is available via {@link #getPathPermissions()}.
-     */
-    public MockContentProvider(Context context,
-            String readPermission,
-            String writePermission,
-            PathPermission[] pathPermissions) {
-        super(context, readPermission, writePermission, pathPermissions);
-    }
-
-    @Override
-    public int delete(Uri uri, String selection, String[] selectionArgs) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public String getType(Uri uri) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public Uri insert(Uri uri, ContentValues values) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public boolean onCreate() {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
-            String sortOrder) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    /**
-     * If you're reluctant to implement this manually, please just call super.bulkInsert().
-     */
-    @Override
-    public int bulkInsert(Uri uri, ContentValues[] values) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public void attachInfo(Context context, ProviderInfo info) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public ContentProviderResult[] applyBatch(ArrayList<ContentProviderOperation> operations) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    /**
-     * @hide
-     */
-    @Override
-    public Bundle call(String method, String request, Bundle args) {
-        throw new UnsupportedOperationException("unimplemented mock method call");
-    }
-
-    @Override
-    public String[] getStreamTypes(Uri url, String mimeTypeFilter) {
-        throw new UnsupportedOperationException("unimplemented mock method call");
-    }
-
-    @Override
-    public AssetFileDescriptor openTypedAssetFile(Uri url, String mimeType, Bundle opts) {
-        throw new UnsupportedOperationException("unimplemented mock method call");
-    }
-
-    /**
-     * @hide
-     */
-    public boolean refresh(Uri url, Bundle args) {
-        throw new UnsupportedOperationException("unimplemented mock method call");
-    }
-
-    /**
-     * Returns IContentProvider which calls back same methods in this class.
-     * By overriding this class, we avoid the mechanism hidden behind ContentProvider
-     * (IPC, etc.)
-     *
-     * @hide
-     */
-    @Override
-    public final IContentProvider getIContentProvider() {
-        return mIContentProvider;
-    }
-}
diff --git a/test-runner/src/android/test/mock/MockContentResolver.java b/test-runner/src/android/test/mock/MockContentResolver.java
deleted file mode 100644
index a70152c8b732..000000000000
--- a/test-runner/src/android/test/mock/MockContentResolver.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.test.mock;
-
-import android.content.ContentProvider;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.IContentProvider;
-import android.database.ContentObserver;
-import android.net.Uri;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * <p>
- *      An extension of {@link android.content.ContentResolver} that is designed for
- *      testing.
- * </p>
- * <p>
- *      MockContentResolver overrides Android's normal way of resolving providers by
- *      authority. To have access to a provider based on its authority, users of
- *      MockContentResolver first instantiate the provider and
- *      use {@link MockContentResolver#addProvider(String, ContentProvider)}. Resolution of an
- *      authority occurs entirely within MockContentResolver.
- * </p>
- * <p>
- *      Users can also set an authority's entry in the map to null, so that a provider is completely
- *      mocked out.
- * </p>
- *
- * <div class="special reference">
- * <h3>Developer Guides</h3>
- * <p>For more information about application testing, read the
- * <a href="{@docRoot}guide/topics/testing/index.html">Testing</a> developer guide.</p>
- * </div>
- */
-public class MockContentResolver extends ContentResolver {
-    Map<String, ContentProvider> mProviders;
-
-    /**
-     * Creates a local map of providers. This map is used instead of the global
-     * map when an API call tries to acquire a provider.
-     */
-    public MockContentResolver() {
-        this(null);
-    }
-
-    /**
-     * Creates a local map of providers. This map is used instead of the global
-     * map when an API call tries to acquire a provider.
-     */
-    public MockContentResolver(Context context) {
-        super(context);
-        mProviders = new HashMap<>();
-    }
-
-    /**
-     * Adds access to a provider based on its authority
-     *
-     * @param name The authority name associated with the provider.
-     * @param provider An instance of {@link android.content.ContentProvider} or one of its
-     * subclasses, or null.
-     */
-    public void addProvider(String name, ContentProvider provider) {
-
-        /*
-         * Maps the authority to the provider locally.
-         */
-        mProviders.put(name, provider);
-    }
-
-    /** @hide */
-    @Override
-    protected IContentProvider acquireProvider(Context context, String name) {
-        return acquireExistingProvider(context, name);
-    }
-
-    /** @hide */
-    @Override
-    protected IContentProvider acquireExistingProvider(Context context, String name) {
-
-        /*
-         * Gets the content provider from the local map
-         */
-        final ContentProvider provider = mProviders.get(name);
-
-        if (provider != null) {
-            return provider.getIContentProvider();
-        } else {
-            return null;
-        }
-    }
-
-    /** @hide */
-    @Override
-    public boolean releaseProvider(IContentProvider provider) {
-        return true;
-    }
-
-    /** @hide */
-    @Override
-    protected IContentProvider acquireUnstableProvider(Context c, String name) {
-        return acquireProvider(c, name);
-    }
-
-    /** @hide */
-    @Override
-    public boolean releaseUnstableProvider(IContentProvider icp) {
-        return releaseProvider(icp);
-    }
-
-    /** @hide */
-    @Override
-    public void unstableProviderDied(IContentProvider icp) {
-    }
-
-    /**
-     * Overrides {@link android.content.ContentResolver#notifyChange(Uri, ContentObserver, boolean)
-     * ContentResolver.notifChange(Uri, ContentObserver, boolean)}. All parameters are ignored.
-     * The method hides providers linked to MockContentResolver from other observers in the system.
-     *
-     * @param uri (Ignored) The uri of the content provider.
-     * @param observer (Ignored) The observer that originated the change.
-     * @param syncToNetwork (Ignored) If true, attempt to sync the change to the network.
-     */
-    @Override
-    public void notifyChange(Uri uri,
-            ContentObserver observer,
-            boolean syncToNetwork) {
-    }
-}
diff --git a/test-runner/src/android/test/mock/MockContext.java b/test-runner/src/android/test/mock/MockContext.java
deleted file mode 100644
index 5e5ba462cfca..000000000000
--- a/test-runner/src/android/test/mock/MockContext.java
+++ /dev/null
@@ -1,847 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.test.mock;
-
-import android.annotation.SystemApi;
-import android.app.IApplicationThread;
-import android.app.IServiceConnection;
-import android.app.Notification;
-import android.content.ComponentName;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.BroadcastReceiver;
-import android.content.IntentSender;
-import android.content.ServiceConnection;
-import android.content.SharedPreferences;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.res.AssetManager;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.database.DatabaseErrorHandler;
-import android.database.sqlite.SQLiteDatabase;
-import android.graphics.Bitmap;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.Looper;
-import android.os.UserHandle;
-import android.view.DisplayAdjustments;
-import android.view.Display;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * A mock {@link android.content.Context} class.  All methods are non-functional and throw
- * {@link java.lang.UnsupportedOperationException}.  You can use this to inject other dependencies,
- * mocks, or monitors into the classes you are testing.
- */
-public class MockContext extends Context {
-
-    @Override
-    public AssetManager getAssets() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Resources getResources() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public PackageManager getPackageManager() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ContentResolver getContentResolver() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Looper getMainLooper() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Context getApplicationContext() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void setTheme(int resid) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Resources.Theme getTheme() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ClassLoader getClassLoader() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public String getPackageName() {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public String getBasePackageName() {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public String getOpPackageName() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ApplicationInfo getApplicationInfo() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public String getPackageResourcePath() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public String getPackageCodePath() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public SharedPreferences getSharedPreferences(String name, int mode) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @removed */
-    @Override
-    public SharedPreferences getSharedPreferences(File file, int mode) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public void reloadSharedPreferences() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean moveSharedPreferencesFrom(Context sourceContext, String name) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean deleteSharedPreferences(String name) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public FileInputStream openFileInput(String name) throws FileNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public FileOutputStream openFileOutput(String name, int mode) throws FileNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean deleteFile(String name) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public File getFileStreamPath(String name) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @removed */
-    @Override
-    public File getSharedPreferencesPath(String name) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public String[] fileList() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public File getDataDir() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public File getFilesDir() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public File getNoBackupFilesDir() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public File getExternalFilesDir(String type) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public File getObbDir() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public File getCacheDir() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public File getCodeCacheDir() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public File getExternalCacheDir() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public File getDir(String name, int mode) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public SQLiteDatabase openOrCreateDatabase(String file, int mode,
-            SQLiteDatabase.CursorFactory factory) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public SQLiteDatabase openOrCreateDatabase(String file, int mode,
-            SQLiteDatabase.CursorFactory factory, DatabaseErrorHandler errorHandler) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public File getDatabasePath(String name) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public String[] databaseList() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean moveDatabaseFrom(Context sourceContext, String name) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean deleteDatabase(String name) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Drawable getWallpaper() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Drawable peekWallpaper() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int getWallpaperDesiredMinimumWidth() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int getWallpaperDesiredMinimumHeight() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void setWallpaper(Bitmap bitmap) throws IOException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void setWallpaper(InputStream data) throws IOException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void clearWallpaper() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void startActivity(Intent intent) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void startActivity(Intent intent, Bundle options) {
-        startActivity(intent);
-    }
-
-    @Override
-    public void startActivities(Intent[] intents) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void startActivities(Intent[] intents, Bundle options) {
-        startActivities(intents);
-    }
-
-    @Override
-    public void startIntentSender(IntentSender intent,
-            Intent fillInIntent, int flagsMask, int flagsValues, int extraFlags)
-            throws IntentSender.SendIntentException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void startIntentSender(IntentSender intent,
-            Intent fillInIntent, int flagsMask, int flagsValues, int extraFlags,
-            Bundle options) throws IntentSender.SendIntentException {
-        startIntentSender(intent, fillInIntent, flagsMask, flagsValues, extraFlags);
-    }
-
-    @Override
-    public void sendBroadcast(Intent intent) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void sendBroadcast(Intent intent, String receiverPermission) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public void sendBroadcastMultiplePermissions(Intent intent, String[] receiverPermissions) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @SystemApi
-    @Override
-    public void sendBroadcast(Intent intent, String receiverPermission, Bundle options) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public void sendBroadcast(Intent intent, String receiverPermission, int appOp) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void sendOrderedBroadcast(Intent intent,
-            String receiverPermission) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void sendOrderedBroadcast(Intent intent, String receiverPermission,
-            BroadcastReceiver resultReceiver, Handler scheduler, int initialCode, String initialData,
-           Bundle initialExtras) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @SystemApi
-    @Override
-    public void sendOrderedBroadcast(Intent intent, String receiverPermission,
-            Bundle options, BroadcastReceiver resultReceiver, Handler scheduler, int initialCode, String initialData,
-            Bundle initialExtras) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public void sendOrderedBroadcast(Intent intent, String receiverPermission, int appOp,
-            BroadcastReceiver resultReceiver, Handler scheduler, int initialCode, String initialData,
-           Bundle initialExtras) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void sendBroadcastAsUser(Intent intent, UserHandle user) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void sendBroadcastAsUser(Intent intent, UserHandle user,
-            String receiverPermission) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @SystemApi
-    @Override
-    public void sendBroadcastAsUser(Intent intent, UserHandle user,
-            String receiverPermission, Bundle options) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public void sendBroadcastAsUser(Intent intent, UserHandle user,
-            String receiverPermission, int appOp) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void sendOrderedBroadcastAsUser(Intent intent, UserHandle user,
-            String receiverPermission, BroadcastReceiver resultReceiver, Handler scheduler,
-            int initialCode, String initialData, Bundle initialExtras) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public void sendOrderedBroadcastAsUser(Intent intent, UserHandle user,
-            String receiverPermission, int appOp, BroadcastReceiver resultReceiver,
-            Handler scheduler, int initialCode, String initialData, Bundle initialExtras) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public void sendOrderedBroadcastAsUser(Intent intent, UserHandle user,
-            String receiverPermission, int appOp, Bundle options, BroadcastReceiver resultReceiver,
-            Handler scheduler, int initialCode, String initialData, Bundle initialExtras) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void sendStickyBroadcast(Intent intent) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void sendStickyOrderedBroadcast(Intent intent,
-            BroadcastReceiver resultReceiver, Handler scheduler, int initialCode, String initialData,
-           Bundle initialExtras) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void removeStickyBroadcast(Intent intent) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void sendStickyBroadcastAsUser(Intent intent, UserHandle user) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public void sendStickyBroadcastAsUser(Intent intent, UserHandle user, Bundle options) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void sendStickyOrderedBroadcastAsUser(Intent intent,
-            UserHandle user, BroadcastReceiver resultReceiver,
-            Handler scheduler, int initialCode, String initialData,
-            Bundle initialExtras) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void removeStickyBroadcastAsUser(Intent intent, UserHandle user) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter,
-            int flags) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter,
-            String broadcastPermission, Handler scheduler) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter,
-            String broadcastPermission, Handler scheduler, int flags) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public Intent registerReceiverAsUser(BroadcastReceiver receiver, UserHandle user,
-            IntentFilter filter, String broadcastPermission, Handler scheduler) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void unregisterReceiver(BroadcastReceiver receiver) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ComponentName startService(Intent service) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ComponentName startForegroundService(Intent service) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean stopService(Intent service) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public ComponentName startServiceAsUser(Intent service, UserHandle user) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public ComponentName startForegroundServiceAsUser(Intent service, UserHandle user) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public boolean stopServiceAsUser(Intent service, UserHandle user) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean bindService(Intent service, ServiceConnection conn, int flags) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public boolean bindServiceAsUser(Intent service, ServiceConnection conn, int flags,
-            UserHandle user) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void unbindService(ServiceConnection conn) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean startInstrumentation(ComponentName className,
-            String profileFile, Bundle arguments) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Object getSystemService(String name) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public String getSystemServiceName(Class<?> serviceClass) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int checkPermission(String permission, int pid, int uid) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public int checkPermission(String permission, int pid, int uid, IBinder callerToken) {
-        return checkPermission(permission, pid, uid);
-    }
-
-    @Override
-    public int checkCallingPermission(String permission) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int checkCallingOrSelfPermission(String permission) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int checkSelfPermission(String permission) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void enforcePermission(
-            String permission, int pid, int uid, String message) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void enforceCallingPermission(String permission, String message) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void enforceCallingOrSelfPermission(String permission, String message) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void grantUriPermission(String toPackage, Uri uri, int modeFlags) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void revokeUriPermission(Uri uri, int modeFlags) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void revokeUriPermission(String targetPackage, Uri uri, int modeFlags) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int checkUriPermission(Uri uri, int pid, int uid, int modeFlags) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public int checkUriPermission(Uri uri, int pid, int uid, int modeFlags, IBinder callerToken) {
-        return checkUriPermission(uri, pid, uid, modeFlags);
-    }
-
-    @Override
-    public int checkCallingUriPermission(Uri uri, int modeFlags) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int checkCallingOrSelfUriPermission(Uri uri, int modeFlags) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int checkUriPermission(Uri uri, String readPermission,
-            String writePermission, int pid, int uid, int modeFlags) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void enforceUriPermission(
-            Uri uri, int pid, int uid, int modeFlags, String message) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void enforceCallingUriPermission(
-            Uri uri, int modeFlags, String message) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void enforceCallingOrSelfUriPermission(
-            Uri uri, int modeFlags, String message) {
-        throw new UnsupportedOperationException();
-    }
-
-    public void enforceUriPermission(
-            Uri uri, String readPermission, String writePermission,
-            int pid, int uid, int modeFlags, String message) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Context createPackageContext(String packageName, int flags)
-            throws PackageManager.NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    /** {@hide} */
-    @Override
-    public Context createApplicationContext(ApplicationInfo application, int flags)
-            throws PackageManager.NameNotFoundException {
-        return null;
-    }
-
-    /** @hide */
-    @Override
-    public Context createContextForSplit(String splitName)
-            throws PackageManager.NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    /** {@hide} */
-    @Override
-    public Context createPackageContextAsUser(String packageName, int flags, UserHandle user)
-            throws PackageManager.NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    /** {@hide} */
-    @Override
-    public int getUserId() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Context createConfigurationContext(Configuration overrideConfiguration) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Context createDisplayContext(Display display) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean isRestricted() {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public DisplayAdjustments getDisplayAdjustments(int displayId) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public Display getDisplay() {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public void updateDisplay(int displayId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public File[] getExternalFilesDirs(String type) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public File[] getObbDirs() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public File[] getExternalCacheDirs() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public File[] getExternalMediaDirs() {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide **/
-    @Override
-    public File getPreloadsFileCache() { throw new UnsupportedOperationException(); }
-
-    @Override
-    public Context createDeviceProtectedStorageContext() {
-        throw new UnsupportedOperationException();
-    }
-
-    /** {@hide} */
-    @SystemApi
-    @Override
-    public Context createCredentialProtectedStorageContext() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean isDeviceProtectedStorage() {
-        throw new UnsupportedOperationException();
-    }
-
-    /** {@hide} */
-    @SystemApi
-    @Override
-    public boolean isCredentialProtectedStorage() {
-        throw new UnsupportedOperationException();
-    }
-
-    /** {@hide} */
-    @Override
-    public boolean canLoadUnsafeResources() {
-        throw new UnsupportedOperationException();
-    }
-
-    /** {@hide} */
-    @Override
-    public IBinder getActivityToken() {
-        throw new UnsupportedOperationException();
-    }
-
-    /** {@hide} */
-    @Override
-    public IServiceConnection getServiceDispatcher(ServiceConnection conn, Handler handler,
-            int flags) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** {@hide} */
-    @Override
-    public IApplicationThread getIApplicationThread() {
-        throw new UnsupportedOperationException();
-    }
-
-    /** {@hide} */
-    @Override
-    public Handler getMainThreadHandler() {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/test-runner/src/android/test/mock/MockCursor.java b/test-runner/src/android/test/mock/MockCursor.java
deleted file mode 100644
index 576f24ad6384..000000000000
--- a/test-runner/src/android/test/mock/MockCursor.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.test.mock;
-
-import android.content.ContentResolver;
-import android.database.CharArrayBuffer;
-import android.database.ContentObserver;
-import android.database.Cursor;
-import android.database.DataSetObserver;
-import android.net.Uri;
-import android.os.Bundle;
-
-/**
- * A mock {@link android.database.Cursor} class that isolates the test code from real
- * Cursor implementation.
- *
- * <p>
- * All methods including ones related to querying the state of the cursor are
- * are non-functional and throw {@link java.lang.UnsupportedOperationException}.
- *
- * @deprecated Use a mocking framework like <a href="https://github.com/mockito/mockito">Mockito</a>.
- * New tests should be written using the
- * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
- */
-@Deprecated
-public class MockCursor implements Cursor {
-    @Override
-    public int getColumnCount() {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public int getColumnIndex(String columnName) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public int getColumnIndexOrThrow(String columnName) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public String getColumnName(int columnIndex) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public String[] getColumnNames() {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public int getCount() {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public boolean isNull(int columnIndex) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public int getInt(int columnIndex) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public long getLong(int columnIndex) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public short getShort(int columnIndex) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public float getFloat(int columnIndex) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public double getDouble(int columnIndex) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public byte[] getBlob(int columnIndex) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public String getString(int columnIndex) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public void setExtras(Bundle extras) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public Bundle getExtras() {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public int getPosition() {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public boolean isAfterLast() {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public boolean isBeforeFirst() {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public boolean isFirst() {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public boolean isLast() {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public boolean move(int offset) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public boolean moveToFirst() {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public boolean moveToLast() {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public boolean moveToNext() {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public boolean moveToPrevious() {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public boolean moveToPosition(int position) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public void copyStringToBuffer(int columnIndex, CharArrayBuffer buffer) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    @Deprecated
-    public void deactivate() {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public void close() {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public boolean isClosed() {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    @Deprecated
-    public boolean requery() {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public void registerContentObserver(ContentObserver observer) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public void registerDataSetObserver(DataSetObserver observer) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public Bundle respond(Bundle extras) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public boolean getWantsAllOnMoveCalls() {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public void setNotificationUri(ContentResolver cr, Uri uri) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public Uri getNotificationUri() {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public void unregisterContentObserver(ContentObserver observer) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public void unregisterDataSetObserver(DataSetObserver observer) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public int getType(int columnIndex) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-}
\ No newline at end of file
diff --git a/test-runner/src/android/test/mock/MockDialogInterface.java b/test-runner/src/android/test/mock/MockDialogInterface.java
deleted file mode 100644
index d0a5a097918d..000000000000
--- a/test-runner/src/android/test/mock/MockDialogInterface.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.test.mock;
-
-import android.content.DialogInterface;
-
-/**
- * A mock {@link android.content.DialogInterface} class.  All methods are non-functional and throw
- * {@link java.lang.UnsupportedOperationException}. Override it to provide the operations that you
- * need.
- *
- * @deprecated Use a mocking framework like <a href="https://github.com/mockito/mockito">Mockito</a>.
- * New tests should be written using the
- * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
- */
-@Deprecated
-public class MockDialogInterface implements DialogInterface {
-    public void cancel() {
-        throw new UnsupportedOperationException("not implemented yet");
-    }
-
-    public void dismiss() {
-        throw new UnsupportedOperationException("not implemented yet");
-    }
-}
diff --git a/test-runner/src/android/test/mock/MockIContentProvider.java b/test-runner/src/android/test/mock/MockIContentProvider.java
deleted file mode 100644
index 112d7eef3dbe..000000000000
--- a/test-runner/src/android/test/mock/MockIContentProvider.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.test.mock;
-
-import android.annotation.Nullable;
-import android.content.ContentProviderOperation;
-import android.content.ContentProviderResult;
-import android.content.ContentValues;
-import android.content.EntityIterator;
-import android.content.IContentProvider;
-import android.content.res.AssetFileDescriptor;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.os.ICancellationSignal;
-import android.os.ParcelFileDescriptor;
-import android.os.RemoteException;
-
-import java.io.FileNotFoundException;
-import java.util.ArrayList;
-
-/**
- * Mock implementation of IContentProvider.  All methods are non-functional and throw
- * {@link java.lang.UnsupportedOperationException}.  Tests can extend this class to
- * implement behavior needed for tests.
- *
- * @hide - @hide because this exposes bulkQuery() and call(), which must also be hidden.
- */
-public class MockIContentProvider implements IContentProvider {
-    @Override
-    public int bulkInsert(String callingPackage, Uri url, ContentValues[] initialValues) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    @SuppressWarnings("unused")
-    public int delete(String callingPackage, Uri url, String selection, String[] selectionArgs)
-            throws RemoteException {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public String getType(Uri url) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    @SuppressWarnings("unused")
-    public Uri insert(String callingPackage, Uri url, ContentValues initialValues)
-            throws RemoteException {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public ParcelFileDescriptor openFile(
-            String callingPackage, Uri url, String mode, ICancellationSignal signal,
-            IBinder callerToken) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public AssetFileDescriptor openAssetFile(
-            String callingPackage, Uri uri, String mode, ICancellationSignal signal) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public ContentProviderResult[] applyBatch(String callingPackage,
-            ArrayList<ContentProviderOperation> operations) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public Cursor query(String callingPackage, Uri url, @Nullable String[] projection,
-            @Nullable Bundle queryArgs, @Nullable ICancellationSignal cancellationSignal) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    public EntityIterator queryEntities(Uri url, String selection, String[] selectionArgs,
-            String sortOrder) {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public int update(String callingPackage, Uri url, ContentValues values, String selection,
-            String[] selectionArgs) throws RemoteException {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public Bundle call(String callingPackage, String method, String request, Bundle args)
-            throws RemoteException {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public IBinder asBinder() {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public String[] getStreamTypes(Uri url, String mimeTypeFilter) throws RemoteException {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public AssetFileDescriptor openTypedAssetFile(String callingPackage, Uri url, String mimeType,
-            Bundle opts, ICancellationSignal signal) throws RemoteException, FileNotFoundException {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public ICancellationSignal createCancellationSignal() throws RemoteException {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public Uri canonicalize(String callingPkg, Uri uri) throws RemoteException {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public Uri uncanonicalize(String callingPkg, Uri uri) throws RemoteException {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-
-    @Override
-    public boolean refresh(String callingPkg, Uri url, Bundle args,
-            ICancellationSignal cancellationSignal) throws RemoteException {
-        throw new UnsupportedOperationException("unimplemented mock method");
-    }
-}
diff --git a/test-runner/src/android/test/mock/MockPackageManager.java b/test-runner/src/android/test/mock/MockPackageManager.java
deleted file mode 100644
index 7e08f51cd87d..000000000000
--- a/test-runner/src/android/test/mock/MockPackageManager.java
+++ /dev/null
@@ -1,1187 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.test.mock;
-
-import android.annotation.NonNull;
-import android.annotation.Nullable;
-import android.app.PackageInstallObserver;
-import android.content.ComponentName;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.IntentSender;
-import android.content.pm.ActivityInfo;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.ChangedPackages;
-import android.content.pm.InstantAppInfo;
-import android.content.pm.FeatureInfo;
-import android.content.pm.IPackageDataObserver;
-import android.content.pm.IPackageDeleteObserver;
-import android.content.pm.IPackageInstallObserver;
-import android.content.pm.IPackageStatsObserver;
-import android.content.pm.InstrumentationInfo;
-import android.content.pm.IntentFilterVerificationInfo;
-import android.content.pm.KeySet;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageInstaller;
-import android.content.pm.PackageItemInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PermissionGroupInfo;
-import android.content.pm.PermissionInfo;
-import android.content.pm.ProviderInfo;
-import android.content.pm.ResolveInfo;
-import android.content.pm.ServiceInfo;
-import android.content.pm.SharedLibraryInfo;
-import android.content.pm.VerifierDeviceIdentity;
-import android.content.pm.VersionedPackage;
-import android.content.res.Resources;
-import android.content.res.XmlResourceParser;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.Handler;
-import android.os.UserHandle;
-import android.os.storage.VolumeInfo;
-
-import java.util.List;
-
-/**
- * A mock {@link android.content.pm.PackageManager} class.  All methods are non-functional and throw
- * {@link java.lang.UnsupportedOperationException}. Override it to provide the operations that you
- * need.
- *
- * @deprecated Use a mocking framework like <a href="https://github.com/mockito/mockito">Mockito</a>.
- * New tests should be written using the
- * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
- */
-@Deprecated
-public class MockPackageManager extends PackageManager {
-
-    @Override
-    public PackageInfo getPackageInfo(String packageName, int flags) throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public PackageInfo getPackageInfo(VersionedPackage versionedPackage,
-            int flags) throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public PackageInfo getPackageInfoAsUser(String packageName, int flags, int userId)
-            throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public String[] currentToCanonicalPackageNames(String[] names) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public String[] canonicalToCurrentPackageNames(String[] names) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Intent getLaunchIntentForPackage(String packageName) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Intent getLeanbackLaunchIntentForPackage(String packageName) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int[] getPackageGids(String packageName) throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int[] getPackageGids(String packageName, int flags) throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int getPackageUid(String packageName, int flags) throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public int getPackageUidAsUser(String packageName, int flags, int userHandle)
-            throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public int getPackageUidAsUser(String packageName, int userHandle)
-            throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public PermissionInfo getPermissionInfo(String name, int flags)
-    throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public List<PermissionInfo> queryPermissionsByGroup(String group, int flags)
-            throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public boolean isPermissionReviewModeEnabled() {
-        return false;
-    }
-
-    @Override
-    public PermissionGroupInfo getPermissionGroupInfo(String name,
-            int flags) throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public List<PermissionGroupInfo> getAllPermissionGroups(int flags) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ApplicationInfo getApplicationInfo(String packageName, int flags)
-            throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public ApplicationInfo getApplicationInfoAsUser(String packageName, int flags, int userId)
-            throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ActivityInfo getActivityInfo(ComponentName className, int flags)
-    throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ActivityInfo getReceiverInfo(ComponentName className, int flags)
-    throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ServiceInfo getServiceInfo(ComponentName className, int flags)
-    throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ProviderInfo getProviderInfo(ComponentName className, int flags)
-    throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public List<PackageInfo> getInstalledPackages(int flags) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public List<PackageInfo> getPackagesHoldingPermissions(String[] permissions,
-            int flags) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public List<PackageInfo> getInstalledPackagesAsUser(int flags, int userId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int checkPermission(String permName, String pkgName) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean canRequestPackageInstalls() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean isPermissionRevokedByPolicy(String permName, String pkgName) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public String getPermissionControllerPackageName() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean addPermission(PermissionInfo info) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean addPermissionAsync(PermissionInfo info) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void removePermission(String name) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public void grantRuntimePermission(String packageName, String permissionName,
-            UserHandle user) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public void revokeRuntimePermission(String packageName, String permissionName,
-            UserHandle user) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public int getPermissionFlags(String permissionName, String packageName, UserHandle user) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public void updatePermissionFlags(String permissionName, String packageName,
-            int flagMask, int flagValues, UserHandle user) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public boolean shouldShowRequestPermissionRationale(String permission) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public void addOnPermissionsChangeListener(OnPermissionsChangedListener listener) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public void removeOnPermissionsChangeListener(OnPermissionsChangedListener listener) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int checkSignatures(String pkg1, String pkg2) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int checkSignatures(int uid1, int uid2) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public String[] getPackagesForUid(int uid) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public String getNameForUid(int uid) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public String[] getNamesForUids(int uid[]) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @hide - to match hiding in superclass
-     */
-    @Override
-    public int getUidForSharedUser(String sharedUserName) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public List<ApplicationInfo> getInstalledApplications(int flags) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public List<ApplicationInfo> getInstalledApplicationsAsUser(int flags, int userId) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public List<InstantAppInfo> getInstantApps() {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public Drawable getInstantAppIcon(String packageName) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public byte[] getInstantAppCookie() {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public boolean isInstantApp() {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public boolean isInstantApp(String packageName) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public int getInstantAppCookieMaxBytes() {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public int getInstantAppCookieMaxSize() {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public void clearInstantAppCookie() {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public void updateInstantAppCookie(@NonNull byte[] cookie) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public boolean setInstantAppCookie(@NonNull byte[] cookie) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public ChangedPackages getChangedPackages(int sequenceNumber) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ResolveInfo resolveActivity(Intent intent, int flags) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public ResolveInfo resolveActivityAsUser(Intent intent, int flags, int userId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public List<ResolveInfo> queryIntentActivities(Intent intent, int flags) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public List<ResolveInfo> queryIntentActivitiesAsUser(Intent intent,
-                                                   int flags, int userId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public List<ResolveInfo> queryIntentActivityOptions(ComponentName caller,
-            Intent[] specifics, Intent intent, int flags) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public List<ResolveInfo> queryBroadcastReceivers(Intent intent, int flags) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public List<ResolveInfo> queryBroadcastReceiversAsUser(Intent intent, int flags, int userId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ResolveInfo resolveService(Intent intent, int flags) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public List<ResolveInfo> queryIntentServices(Intent intent, int flags) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public List<ResolveInfo> queryIntentServicesAsUser(Intent intent, int flags, int userId) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public List<ResolveInfo> queryIntentContentProvidersAsUser(
-            Intent intent, int flags, int userId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public List<ResolveInfo> queryIntentContentProviders(Intent intent, int flags) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public ProviderInfo resolveContentProvider(String name, int flags) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public ProviderInfo resolveContentProviderAsUser(String name, int flags, int userId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public List<ProviderInfo> queryContentProviders(String processName, int uid, int flags) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public InstrumentationInfo getInstrumentationInfo(ComponentName className, int flags)
-    throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public List<InstrumentationInfo> queryInstrumentation(
-            String targetPackage, int flags) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Drawable getDrawable(String packageName, int resid, ApplicationInfo appInfo) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Drawable getActivityIcon(ComponentName activityName)
-    throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Drawable getActivityIcon(Intent intent) throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Drawable getDefaultActivityIcon() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Drawable getActivityBanner(ComponentName activityName)
-            throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Drawable getActivityBanner(Intent intent) throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Drawable getApplicationBanner(ApplicationInfo info) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Drawable getApplicationBanner(String packageName) throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Drawable getApplicationIcon(ApplicationInfo info) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Drawable getApplicationIcon(String packageName) throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Drawable getActivityLogo(ComponentName activityName) throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Drawable getActivityLogo(Intent intent) throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Drawable getApplicationLogo(ApplicationInfo info) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Drawable getApplicationLogo(String packageName) throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Drawable getUserBadgedIcon(Drawable icon, UserHandle user) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Drawable getUserBadgedDrawableForDensity(Drawable drawable, UserHandle user,
-            Rect badgeLocation,
-            int badgeDensity) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public Drawable getUserBadgeForDensity(UserHandle user, int density) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public Drawable getUserBadgeForDensityNoBackground(UserHandle user, int density) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public CharSequence getUserBadgedLabel(CharSequence label, UserHandle user) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public CharSequence getText(String packageName, int resid, ApplicationInfo appInfo) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public XmlResourceParser getXml(String packageName, int resid,
-            ApplicationInfo appInfo) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public CharSequence getApplicationLabel(ApplicationInfo info) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Resources getResourcesForActivity(ComponentName activityName)
-    throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Resources getResourcesForApplication(ApplicationInfo app) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public Resources getResourcesForApplication(String appPackageName)
-    throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public Resources getResourcesForApplicationAsUser(String appPackageName, int userId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public PackageInfo getPackageArchiveInfo(String archiveFilePath, int flags) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @hide - to match hiding in superclass
-     */
-    @Override
-    public void installPackage(Uri packageURI, IPackageInstallObserver observer,
-            int flags, String installerPackageName) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void setInstallerPackageName(String targetPackage,
-            String installerPackageName) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public void setUpdateAvailable(String packageName, boolean updateAvailable) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public String getInstallerPackageName(String packageName) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** {@hide} */
-    @Override
-    public int getMoveStatus(int moveId) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** {@hide} */
-    @Override
-    public void registerMoveCallback(MoveCallback callback, Handler handler) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** {@hide} */
-    @Override
-    public void unregisterMoveCallback(MoveCallback callback) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** {@hide} */
-    @Override
-    public int movePackage(String packageName, VolumeInfo vol) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** {@hide} */
-    @Override
-    public VolumeInfo getPackageCurrentVolume(ApplicationInfo app) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** {@hide} */
-    @Override
-    public List<VolumeInfo> getPackageCandidateVolumes(ApplicationInfo app) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** {@hide} */
-    @Override
-    public int movePrimaryStorage(VolumeInfo vol) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** {@hide} */
-    @Override
-    public VolumeInfo getPrimaryStorageCurrentVolume() {
-        throw new UnsupportedOperationException();
-    }
-
-    /** {@hide} */
-    @Override
-    public List<VolumeInfo> getPrimaryStorageCandidateVolumes() {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @hide - to match hiding in superclass
-     */
-    @Override
-    public void clearApplicationUserData(
-            String packageName, IPackageDataObserver observer) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @hide - to match hiding in superclass
-     */
-    @Override
-    public void deleteApplicationCacheFiles(
-            String packageName, IPackageDataObserver observer) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @hide - to match hiding in superclass
-     */
-    @Override
-    public void deleteApplicationCacheFilesAsUser(String packageName, int userId,
-            IPackageDataObserver observer) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** {@hide} */
-    @Override
-    public void freeStorageAndNotify(String volumeUuid, long idealStorageSize,
-            IPackageDataObserver observer) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** {@hide} */
-    @Override
-    public void freeStorage(String volumeUuid, long idealStorageSize, IntentSender pi) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @hide - to match hiding in superclass
-     */
-    @Override
-    public void deletePackage(String packageName, IPackageDeleteObserver observer, int flags) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @hide - to match hiding in superclass
-     */
-    @Override
-    public void deletePackageAsUser(String packageName, IPackageDeleteObserver observer,
-            int flags, int userId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void addPackageToPreferred(String packageName) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void removePackageFromPreferred(String packageName) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public List<PackageInfo> getPreferredPackages(int flags) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void setComponentEnabledSetting(ComponentName componentName,
-            int newState, int flags) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int getComponentEnabledSetting(ComponentName componentName) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void setApplicationEnabledSetting(String packageName, int newState, int flags) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int getApplicationEnabledSetting(String packageName) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public void flushPackageRestrictionsAsUser(int userId) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void addPreferredActivity(IntentFilter filter,
-            int match, ComponentName[] set, ComponentName activity) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @hide - to match hiding in superclass
-     */
-    @Override
-    public void replacePreferredActivity(IntentFilter filter,
-            int match, ComponentName[] set, ComponentName activity) {
-        throw new UnsupportedOperationException();
-    }
-
-
-    @Override
-    public void clearPackagePreferredActivities(String packageName) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @hide - to match hiding in superclass
-     */
-    @Override
-    public void getPackageSizeInfoAsUser(String packageName, int userHandle,
-            IPackageStatsObserver observer) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public int getPreferredActivities(List<IntentFilter> outFilters,
-            List<ComponentName> outActivities, String packageName) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide - hidden in superclass */
-    @Override
-    public ComponentName getHomeActivities(List<ResolveInfo> outActivities) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public String[] getSystemSharedLibraryNames() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public @NonNull List<SharedLibraryInfo> getSharedLibraries(int flags) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public @NonNull List<SharedLibraryInfo> getSharedLibrariesAsUser(int flags, int userId) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public @NonNull String getServicesSystemSharedLibraryPackageName() {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public @NonNull String getSharedSystemSharedLibraryPackageName() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public FeatureInfo[] getSystemAvailableFeatures() {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean hasSystemFeature(String name) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean hasSystemFeature(String name, int version) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public boolean isSafeMode() {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public KeySet getKeySetByAlias(String packageName, String alias) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public KeySet getSigningKeySet(String packageName) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public boolean isSignedBy(String packageName, KeySet ks) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public boolean isSignedByExactly(String packageName, KeySet ks) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public String[] setPackagesSuspendedAsUser(String[] packageNames, boolean hidden, int userId) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public boolean isPackageSuspendedForUser(String packageName, int userId) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** @hide */
-    @Override
-    public void setApplicationCategoryHint(String packageName, int categoryHint) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @hide
-     */
-    @Override
-    public boolean setApplicationHiddenSettingAsUser(String packageName, boolean hidden,
-            UserHandle user) {
-        return false;
-    }
-
-    /**
-     * @hide
-     */
-    @Override
-    public boolean getApplicationHiddenSettingAsUser(String packageName, UserHandle user) {
-        return false;
-    }
-
-    /**
-     * @hide
-     */
-    @Override
-    public int installExistingPackage(String packageName) throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @hide
-     */
-    @Override
-    public int installExistingPackage(String packageName, int installReason)
-            throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @hide
-     */
-    @Override
-    public int installExistingPackageAsUser(String packageName, int userId)
-            throws NameNotFoundException {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void verifyPendingInstall(int id, int verificationCode) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public void extendVerificationTimeout(int id, int verificationCodeAtTimeout,
-            long millisecondsToDelay) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @hide
-     */
-    @Override
-    public void verifyIntentFilter(int id, int verificationCode, List<String> outFailedDomains) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @hide
-     */
-    @Override
-    public int getIntentVerificationStatusAsUser(String packageName, int userId) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @hide
-     */
-    @Override
-    public boolean updateIntentVerificationStatusAsUser(String packageName, int status, int userId) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @hide
-     */
-    @Override
-    public List<IntentFilterVerificationInfo> getIntentFilterVerifications(String packageName) {
-        throw new UnsupportedOperationException();
-    }
-
-    @Override
-    public List<IntentFilter> getAllIntentFilters(String packageName) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** {@removed} */
-    @Deprecated
-    public String getDefaultBrowserPackageName(int userId) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** {@hide} */
-    @Override
-    public String getDefaultBrowserPackageNameAsUser(int userId) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** {@removed} */
-    @Deprecated
-    public boolean setDefaultBrowserPackageName(String packageName, int userId) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** {@hide} */
-    @Override
-    public boolean setDefaultBrowserPackageNameAsUser(String packageName, int userId) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @hide
-     */
-    @Override
-    public VerifierDeviceIdentity getVerifierDeviceIdentity() {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @hide
-     */
-    @Override
-    public boolean isUpgrade() {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @hide
-     */
-    @Override
-    public void installPackage(Uri packageURI, PackageInstallObserver observer,
-            int flags, String installerPackageName) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @hide
-     */
-    @Override
-    public void addCrossProfileIntentFilter(IntentFilter filter, int sourceUserId, int targetUserId,
-            int flags) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @hide
-     */
-    @Override
-    public void clearCrossProfileIntentFilters(int sourceUserId) {
-        throw new UnsupportedOperationException();
-    }
-
-    /** {@hide} */
-    public PackageInstaller getPackageInstaller() {
-        throw new UnsupportedOperationException();
-    }
-
-    /** {@hide} */
-    @Override
-    public boolean isPackageAvailable(String packageName) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @hide
-     */
-    public Drawable loadItemIcon(PackageItemInfo itemInfo, ApplicationInfo appInfo) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @hide
-     */
-    public Drawable loadUnbadgedItemIcon(PackageItemInfo itemInfo, ApplicationInfo appInfo) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @hide
-     */
-    public int getInstallReason(String packageName, UserHandle user) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @hide
-     */
-    @Override
-    public ComponentName getInstantAppResolverSettingsComponent() {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @hide
-     */
-    @Override
-    public ComponentName getInstantAppInstallerComponent() {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @hide
-     */
-    public String getInstantAppAndroidId(String packageName, UserHandle user) {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * @hide
-     */
-    @Override
-    public void registerDexModule(String dexModulePath,
-            @Nullable DexModuleRegisterCallback callback) {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/test-runner/src/android/test/mock/MockResources.java b/test-runner/src/android/test/mock/MockResources.java
deleted file mode 100644
index 880343e5e780..000000000000
--- a/test-runner/src/android/test/mock/MockResources.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.test.mock;
-
-import android.content.res.AssetManager;
-import android.content.res.Resources;
-import android.content.res.Configuration;
-import android.content.res.TypedArray;
-import android.content.res.ColorStateList;
-import android.content.res.XmlResourceParser;
-import android.content.res.AssetFileDescriptor;
-import android.util.DisplayMetrics;
-import android.util.TypedValue;
-import android.util.AttributeSet;
-import android.graphics.drawable.Drawable;
-import android.graphics.Movie;
-
-import java.io.InputStream;
-
-/**
- * A mock {@link android.content.res.Resources} class. All methods are non-functional and throw
- * {@link java.lang.UnsupportedOperationException}. Override it to provide the operations that you
- * need.
- *
- * @deprecated Use a mocking framework like <a href="https://github.com/mockito/mockito">Mockito</a>.
- * New tests should be written using the
- * <a href="{@docRoot}tools/testing-support-library/index.html">Android Testing Support Library</a>.
- */
-@Deprecated
-public class MockResources extends Resources {
-
-    public MockResources() {
-        super(new AssetManager(), null, null);
-    }
-
-    @Override
-    public void updateConfiguration(Configuration config, DisplayMetrics metrics) {
-        // this method is called from the constructor, so we just do nothing
-    }
-
-    @Override
-    public CharSequence getText(int id) throws NotFoundException {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public CharSequence getQuantityText(int id, int quantity) throws NotFoundException {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public String getString(int id) throws NotFoundException {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public String getString(int id, Object... formatArgs) throws NotFoundException {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public String getQuantityString(int id, int quantity, Object... formatArgs)
-            throws NotFoundException {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public String getQuantityString(int id, int quantity) throws NotFoundException {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public CharSequence getText(int id, CharSequence def) {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public CharSequence[] getTextArray(int id) throws NotFoundException {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public String[] getStringArray(int id) throws NotFoundException {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public int[] getIntArray(int id) throws NotFoundException {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public TypedArray obtainTypedArray(int id) throws NotFoundException {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public float getDimension(int id) throws NotFoundException {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public int getDimensionPixelOffset(int id) throws NotFoundException {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public int getDimensionPixelSize(int id) throws NotFoundException {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public Drawable getDrawable(int id) throws NotFoundException {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public Movie getMovie(int id) throws NotFoundException {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public int getColor(int id) throws NotFoundException {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public ColorStateList getColorStateList(int id) throws NotFoundException {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public int getInteger(int id) throws NotFoundException {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public XmlResourceParser getLayout(int id) throws NotFoundException {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public XmlResourceParser getAnimation(int id) throws NotFoundException {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public XmlResourceParser getXml(int id) throws NotFoundException {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public InputStream openRawResource(int id) throws NotFoundException {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public AssetFileDescriptor openRawResourceFd(int id) throws NotFoundException {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public void getValue(int id, TypedValue outValue, boolean resolveRefs)
-            throws NotFoundException {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public void getValue(String name, TypedValue outValue, boolean resolveRefs)
-            throws NotFoundException {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public TypedArray obtainAttributes(AttributeSet set, int[] attrs) {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public DisplayMetrics getDisplayMetrics() {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public Configuration getConfiguration() {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public int getIdentifier(String name, String defType, String defPackage) {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public String getResourceName(int resid) throws NotFoundException {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public String getResourcePackageName(int resid) throws NotFoundException {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public String getResourceTypeName(int resid) throws NotFoundException {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-
-    @Override
-    public String getResourceEntryName(int resid) throws NotFoundException {
-        throw new UnsupportedOperationException("mock object, not implemented");
-    }
-}
diff --git a/test-runner/src/android/test/mock/package.html b/test-runner/src/android/test/mock/package.html
deleted file mode 100644
index c0fcd1ea336a..000000000000
--- a/test-runner/src/android/test/mock/package.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<HTML>
-<BODY>
-<p>Utility classes providing stubs or mocks of various Android framework building blocks.</p>
-
-<p>For more information, see the
-<a href="{@docRoot}tools/testing/index.html">Testing</a> guide.</p>
-{@more}
-
-</BODY>
-</HTML>