From dfa93abf2f64237007af8e72c4a4114a5258e858 Mon Sep 17 00:00:00 2001 From: Todd Kennedy Date: Thu, 3 Mar 2016 15:24:33 -0800 Subject: [PATCH] Fix javadoc Make referenced constants @SystemApi and change argument name to match its actual meaning. bug: 25441401 Change-Id: I4277799b95f394edb4305be05f57437717a86691 --- api/system-current.txt | 2 ++ core/java/android/app/ApplicationPackageManager.java | 4 ++-- core/java/android/content/pm/PackageManager.java | 10 ++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index 8347cd7dcb07e..b5a8513853baa 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -10186,6 +10186,8 @@ package android.content.pm { field public static final int INSTALL_PARSE_FAILED_NO_CERTIFICATES = -103; // 0xffffff99 field public static final int INSTALL_PARSE_FAILED_UNEXPECTED_EXCEPTION = -102; // 0xffffff9a field public static final int INSTALL_SUCCEEDED = 1; // 0x1 + field public static final int INTENT_FILTER_VERIFICATION_FAILURE = -1; // 0xffffffff + field public static final int INTENT_FILTER_VERIFICATION_SUCCESS = 1; // 0x1 field public static final int MASK_PERMISSION_FLAGS = 255; // 0xff field public static final int MATCH_ALL = 131072; // 0x20000 field public static final int MATCH_DEFAULT_ONLY = 65536; // 0x10000 diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index c8411119430f2..38f32f7165edd 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -1543,9 +1543,9 @@ public class ApplicationPackageManager extends PackageManager { } @Override - public void verifyIntentFilter(int id, int verificationCode, List outFailedDomains) { + public void verifyIntentFilter(int id, int verificationCode, List failedDomains) { try { - mPM.verifyIntentFilter(id, verificationCode, outFailedDomains); + mPM.verifyIntentFilter(id, verificationCode, failedDomains); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index c1a559e27676a..0dc856c5da4f7 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -1312,6 +1312,7 @@ public abstract class PackageManager { * * @hide */ + @SystemApi public static final int INTENT_FILTER_VERIFICATION_SUCCESS = 1; /** @@ -1321,6 +1322,7 @@ public abstract class PackageManager { * * @hide */ + @SystemApi public static final int INTENT_FILTER_VERIFICATION_FAILURE = -1; /** @@ -4731,8 +4733,8 @@ public abstract class PackageManager { /** * Allows a package listening to the - * {@link Intent#ACTION_INTENT_FILTER_NEEDS_VERIFICATION intent filter verification - * broadcast} to respond to the package manager. The response must include + * {@link Intent#ACTION_INTENT_FILTER_NEEDS_VERIFICATION} intent filter verification + * broadcast to respond to the package manager. The response must include * the {@code verificationCode} which is one of * {@link PackageManager#INTENT_FILTER_VERIFICATION_SUCCESS} or * {@link PackageManager#INTENT_FILTER_VERIFICATION_FAILURE}. @@ -4741,7 +4743,7 @@ public abstract class PackageManager { * {@link PackageManager#EXTRA_VERIFICATION_ID} Intent extra. * @param verificationCode either {@link PackageManager#INTENT_FILTER_VERIFICATION_SUCCESS} * or {@link PackageManager#INTENT_FILTER_VERIFICATION_FAILURE}. - * @param outFailedDomains a list of failed domains if the verificationCode is + * @param failedDomains a list of failed domains if the verificationCode is * {@link PackageManager#INTENT_FILTER_VERIFICATION_FAILURE}, otherwise null; * @throws SecurityException if the caller does not have the * INTENT_FILTER_VERIFICATION_AGENT permission. @@ -4750,7 +4752,7 @@ public abstract class PackageManager { */ @SystemApi public abstract void verifyIntentFilter(int verificationId, int verificationCode, - List outFailedDomains); + List failedDomains); /** * Get the status of a Domain Verification Result for an IntentFilter. This is