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

Merge "Fix javadoc" into nyc-dev

Browse Source
This commit is contained in:
Todd Kennedy
2016-03-03 23:30:09 +00:00
committed by Android (Google) Code Review
parent 578f19453a dfa93abf2f
commit 39428c1337
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -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

4
core/java/android/app/ApplicationPackageManager.java
View File

@@ -1543,9 +1543,9 @@ public class ApplicationPackageManager extends PackageManager {
}
@Override
public void verifyIntentFilter(int id, int verificationCode, List<String> outFailedDomains) {
public void verifyIntentFilter(int id, int verificationCode, List<String> failedDomains) {
try {
mPM.verifyIntentFilter(id, verificationCode, outFailedDomains);
mPM.verifyIntentFilter(id, verificationCode, failedDomains);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}

10
core/java/android/content/pm/PackageManager.java
View File

@@ -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<String> outFailedDomains);
List<String> failedDomains);
/**
* Get the status of a Domain Verification Result for an IntentFilter. This is