summaryrefslogtreecommitdiff
path: root/test-mock/api
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2017-12-15 12:49:36 +0000
committerPaul Duffin <paulduffin@google.com>2017-12-19 19:56:21 +0000
commita23c84c7cac4a48e5850ac7834e7ea233e498963 (patch)
tree34ae50b491e67cd528ac82e6fb4d1c969ed717b0 /test-mock/api
parentbd97e3dd4e5d395f336114016b000ef3cfb26053 (diff)
Add android.test.mock.stubs-system
The android.test.mock package contains one class with some methods that are annotated with @SystemApi which are not present in the android.test.mock.stubs. This adds a new android.test.mock.stubs-system library that includes those additional methods. Checked that the new API definition files contain the exact same definitions for the android.test.mock packages as are found in the api/system-current.txt and api/system-removed.txt files. Bug: 30188076 Test: make update-api && make checkbuild Change-Id: I4644d30716e556204caa4acb53d7af84ca520271
Diffstat (limited to 'test-mock/api')
-rw-r--r--test-mock/api/android-test-mock-system-current.txt38
-rw-r--r--test-mock/api/android-test-mock-system-removed.txt0
-rw-r--r--test-mock/api/apicheck_msg_android_test_mock-system.txt17
3 files changed, 55 insertions, 0 deletions
diff --git a/test-mock/api/android-test-mock-system-current.txt b/test-mock/api/android-test-mock-system-current.txt
new file mode 100644
index 000000000000..20401a50b6a2
--- /dev/null
+++ b/test-mock/api/android-test-mock-system-current.txt
@@ -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>);
+ }
+
+}
+
diff --git a/test-mock/api/android-test-mock-system-removed.txt b/test-mock/api/android-test-mock-system-removed.txt
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/test-mock/api/android-test-mock-system-removed.txt
diff --git a/test-mock/api/apicheck_msg_android_test_mock-system.txt b/test-mock/api/apicheck_msg_android_test_mock-system.txt
new file mode 100644
index 000000000000..3a97117f3ea1
--- /dev/null
+++ b/test-mock/api/apicheck_msg_android_test_mock-system.txt
@@ -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.
+******************************
+
+
+