Merge changes from topic "fix-atm-visibility-issues"
* changes: Add android.test.mock.stubs-system Fix visibility issues with android.test.mock.stubs
This commit is contained in:
Paul Duffin
@@ -16,7 +16,12 @@
|
||||
|
||||
LOCAL_PATH:= $(call my-dir)
|
||||
|
||||
android_test_mock_source_files := $(call all-java-files-under, src/android/test/mock)
|
||||
# Includes the main framework source to ensure that doclava has access to the
|
||||
# visibility information for the base classes of the mock classes. Without it
|
||||
# otherwise hidden methods could be visible.
|
||||
android_test_mock_source_files := \
|
||||
$(call all-java-files-under, src/android/test/mock) \
|
||||
$(call all-java-files-under, ../core/java) \
|
||||
|
||||
# For unbundled build we'll use the prebuilt jar from prebuilts/sdk.
|
||||
ifeq (,$(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)))
|
||||
@@ -67,6 +72,8 @@ LOCAL_SOURCE_FILES_ALL_GENERATED := true
|
||||
LOCAL_ADDITIONAL_DEPENDENCIES := $(android_test_mock_gen_stamp)
|
||||
android_test_mock_gen_stamp :=
|
||||
|
||||
LOCAL_SDK_VERSION := current
|
||||
|
||||
include $(BUILD_STATIC_JAVA_LIBRARY)
|
||||
|
||||
# Archive a copy of the classes.jar in SDK build.
|
||||
@@ -104,4 +111,91 @@ update-android-test-mock-api: $(ANDROID_TEST_MOCK_OUTPUT_API_FILE) | $(ACP)
|
||||
@echo Copying removed.txt
|
||||
$(hide) $(ACP) $(ANDROID_TEST_MOCK_OUTPUT_REMOVED_API_FILE) $(ANDROID_TEST_MOCK_REMOVED_API_FILE)
|
||||
|
||||
# Generate the stub source files for android.test.mock.stubs-system
|
||||
# =================================================================
|
||||
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_SYSTEM_OUTPUT_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.mock.stubs-system_intermediates/api.txt
|
||||
ANDROID_TEST_MOCK_SYSTEM_OUTPUT_REMOVED_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.mock.stubs-system_intermediates/removed.txt
|
||||
|
||||
ANDROID_TEST_MOCK_SYSTEM_API_FILE := $(LOCAL_PATH)/api/android-test-mock-system-current.txt
|
||||
ANDROID_TEST_MOCK_SYSTEM_REMOVED_API_FILE := $(LOCAL_PATH)/api/android-test-mock-system-removed.txt
|
||||
|
||||
LOCAL_DROIDDOC_OPTIONS:= \
|
||||
-stubpackages android.test.mock \
|
||||
-stubs $(TARGET_OUT_COMMON_INTERMEDIATES)/JAVA_LIBRARIES/android.test.mock.stubs-system_intermediates/src \
|
||||
-nodocs \
|
||||
-showAnnotation android.annotation.SystemApi \
|
||||
-api $(ANDROID_TEST_MOCK_SYSTEM_OUTPUT_API_FILE) \
|
||||
-removedApi $(ANDROID_TEST_MOCK_SYSTEM_OUTPUT_REMOVED_API_FILE) \
|
||||
|
||||
LOCAL_UNINSTALLABLE_MODULE := true
|
||||
LOCAL_MODULE := android-test-mock-system-api-stubs-gen
|
||||
|
||||
include $(BUILD_DROIDDOC)
|
||||
|
||||
# Remember the target that will trigger the code generation.
|
||||
android_test_mock_system_gen_stamp := $(full_target)
|
||||
|
||||
# Add some additional dependencies
|
||||
$(ANDROID_TEST_MOCK_SYSTEM_OUTPUT_API_FILE): $(full_target)
|
||||
$(ANDROID_TEST_MOCK_SYSTEM_OUTPUT_REMOVED_API_FILE): $(full_target)
|
||||
|
||||
# Build the android.test.mock.stubs-system library
|
||||
# ================================================
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_MODULE := android.test.mock.stubs-system
|
||||
|
||||
LOCAL_SOURCE_FILES_ALL_GENERATED := true
|
||||
|
||||
# Make sure to run droiddoc first to generate the stub source files.
|
||||
LOCAL_ADDITIONAL_DEPENDENCIES := $(android_test_mock_system_gen_stamp)
|
||||
android_test_mock_system_gen_stamp :=
|
||||
|
||||
LOCAL_SDK_VERSION := system_current
|
||||
|
||||
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_system.jar)
|
||||
|
||||
# Check that the android.test.mock.stubs-system 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-system-api-current, \
|
||||
$(ANDROID_TEST_MOCK_SYSTEM_API_FILE), \
|
||||
$(ANDROID_TEST_MOCK_SYSTEM_OUTPUT_API_FILE), \
|
||||
$(ANDROID_TEST_MOCK_SYSTEM_REMOVED_API_FILE), \
|
||||
$(ANDROID_TEST_MOCK_SYSTEM_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-system.txt, \
|
||||
check-android-test-mock-system-api, \
|
||||
$(call doc-timestamp-for,android-test-mock-system-api-stubs-gen) \
|
||||
))
|
||||
|
||||
.PHONY: check-android-test-mock-system-api
|
||||
checkapi: check-android-test-mock-system-api
|
||||
|
||||
.PHONY: update-android-test-mock-system-api
|
||||
update-api: update-android-test-mock-system-api
|
||||
|
||||
update-android-test-mock-system-api: $(ANDROID_TEST_MOCK_SYSTEM_OUTPUT_API_FILE) | $(ACP)
|
||||
@echo Copying current.txt
|
||||
$(hide) $(ACP) $(ANDROID_TEST_MOCK_SYSTEM_OUTPUT_API_FILE) $(ANDROID_TEST_MOCK_SYSTEM_API_FILE)
|
||||
@echo Copying removed.txt
|
||||
$(hide) $(ACP) $(ANDROID_TEST_MOCK_SYSTEM_OUTPUT_REMOVED_API_FILE) $(ANDROID_TEST_MOCK_SYSTEM_REMOVED_API_FILE)
|
||||
|
||||
endif # not TARGET_BUILD_APPS not TARGET_BUILD_PDK=true
|
||||
|
||||
|
||||
@@ -10,7 +10,6 @@ package android.test.mock {
|
||||
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 final android.content.IContentProvider getIContentProvider();
|
||||
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();
|
||||
@@ -22,37 +21,26 @@ package android.test.mock {
|
||||
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, int, int, int, android.os.IBinder);
|
||||
method public int checkUriPermission(android.net.Uri, java.lang.String, java.lang.String, int, int, int);
|
||||
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);
|
||||
@@ -68,7 +56,6 @@ package android.test.mock {
|
||||
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();
|
||||
@@ -76,8 +63,6 @@ package android.test.mock {
|
||||
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);
|
||||
@@ -89,25 +74,19 @@ package android.test.mock {
|
||||
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);
|
||||
@@ -120,31 +99,19 @@ package android.test.mock {
|
||||
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);
|
||||
@@ -155,17 +122,13 @@ package android.test.mock {
|
||||
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 {
|
||||
@@ -221,8 +184,6 @@ package android.test.mock {
|
||||
|
||||
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);
|
||||
@@ -232,19 +193,10 @@ package android.test.mock {
|
||||
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;
|
||||
@@ -257,148 +209,75 @@ package android.test.mock {
|
||||
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.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);
|
||||
}
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@ 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);
|
||||
method public boolean setInstantAppCookie(byte[]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
38
test-mock/api/android-test-mock-system-current.txt
Normal file
38
test-mock/api/android-test-mock-system-current.txt
Normal file
@@ -0,0 +1,38 @@
|
||||
package android.test.mock {
|
||||
|
||||
public class MockContext extends android.content.Context {
|
||||
method public android.content.Context createCredentialProtectedStorageContext();
|
||||
method public java.io.File getPreloadsFileCache();
|
||||
method public boolean isCredentialProtectedStorage();
|
||||
method public void sendBroadcast(android.content.Intent, java.lang.String, android.os.Bundle);
|
||||
method public void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle, 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);
|
||||
}
|
||||
|
||||
public deprecated class MockPackageManager extends android.content.pm.PackageManager {
|
||||
method public void addOnPermissionsChangeListener(android.content.pm.PackageManager.OnPermissionsChangedListener);
|
||||
method public java.util.List<android.content.IntentFilter> getAllIntentFilters(java.lang.String);
|
||||
method public java.lang.String getDefaultBrowserPackageNameAsUser(int);
|
||||
method public java.util.List<android.content.pm.PackageInfo> getInstalledPackagesAsUser(int, int);
|
||||
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 java.util.List<android.content.pm.IntentFilterVerificationInfo> getIntentFilterVerifications(java.lang.String);
|
||||
method public int getIntentVerificationStatusAsUser(java.lang.String, int);
|
||||
method public int getPermissionFlags(java.lang.String, java.lang.String, android.os.UserHandle);
|
||||
method public void grantRuntimePermission(java.lang.String, java.lang.String, android.os.UserHandle);
|
||||
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 void registerDexModule(java.lang.String, android.content.pm.PackageManager.DexModuleRegisterCallback);
|
||||
method public void removeOnPermissionsChangeListener(android.content.pm.PackageManager.OnPermissionsChangedListener);
|
||||
method public void revokeRuntimePermission(java.lang.String, java.lang.String, android.os.UserHandle);
|
||||
method public boolean setDefaultBrowserPackageNameAsUser(java.lang.String, int);
|
||||
method public void setUpdateAvailable(java.lang.String, boolean);
|
||||
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>);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
0
test-mock/api/android-test-mock-system-removed.txt
Normal file
0
test-mock/api/android-test-mock-system-removed.txt
Normal file
17
test-mock/api/apicheck_msg_android_test_mock-system.txt
Normal file
17
test-mock/api/apicheck_msg_android_test_mock-system.txt
Normal file
@@ -0,0 +1,17 @@
|
||||
|
||||
******************************
|
||||
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-system-api
|
||||
|
||||
To submit the revised android-test-mock-system-current.txt to the main Android repository,
|
||||
you will need approval.
|
||||
******************************
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user