Merge "Expose Instant App API defined in MR1" (aae1cc59) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -31022,6 +31022,7 @@ package android.os {
		method public boolean match(java.lang.String);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.os.PatternMatcher> CREATOR;
		field public static final int PATTERN_ADVANCED_GLOB = 3; // 0x3
		field public static final int PATTERN_LITERAL = 0; // 0x0
		field public static final int PATTERN_PREFIX = 1; // 0x1
		field public static final int PATTERN_SIMPLE_GLOB = 2; // 0x2

api/system-current.txt

+22 −0

Original line number	Diff line number	Diff line
		@@ -9908,6 +9908,7 @@ package android.content {
		method public final java.lang.String getDataScheme(int);
		method public final android.os.PatternMatcher getDataSchemeSpecificPart(int);
		method public final java.lang.String getDataType(int);
		method public final int getOrder();
		method public final int getPriority();
		method public final boolean hasAction(java.lang.String);
		method public final boolean hasCategory(java.lang.String);
		@@ -9926,6 +9927,7 @@ package android.content {
		method public void readFromXml(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
		method public final java.util.Iterator<android.os.PatternMatcher> schemeSpecificPartsIterator();
		method public final java.util.Iterator<java.lang.String> schemesIterator();
		method public final void setOrder(int);
		method public final void setPriority(int);
		method public final java.util.Iterator<java.lang.String> typesIterator();
		method public final void writeToParcel(android.os.Parcel, int);
		@@ -10599,6 +10601,20 @@ package android.content.pm {
		field public int version;
		}

		public final class InstantAppInfo implements android.os.Parcelable {
		ctor public InstantAppInfo(android.content.pm.ApplicationInfo, java.lang.String[], java.lang.String[]);
		ctor public InstantAppInfo(java.lang.String, java.lang.CharSequence, java.lang.String[], java.lang.String[]);
		method public int describeContents();
		method public android.content.pm.ApplicationInfo getApplicationInfo();
		method public java.lang.String[] getGrantedPermissions();
		method public java.lang.String getPackageName();
		method public java.lang.String[] getRequestedPermissions();
		method public android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager);
		method public java.lang.CharSequence loadLabel(android.content.pm.PackageManager);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.content.pm.InstantAppInfo> CREATOR;
		}

		public final class InstantAppIntentFilter implements android.os.Parcelable {
		ctor public InstantAppIntentFilter(java.lang.String, java.util.List<android.content.IntentFilter>);
		method public int describeContents();
		@@ -10954,6 +10970,8 @@ package android.content.pm {
		method public abstract java.lang.String getInstallerPackageName(java.lang.String);
		method public abstract byte[] getInstantAppCookie();
		method public abstract int getInstantAppCookieMaxSize();
		method public abstract android.graphics.drawable.Drawable getInstantAppIcon(java.lang.String);
		method public abstract java.util.List<android.content.pm.InstantAppInfo> getInstantApps();
		method public abstract android.content.pm.InstrumentationInfo getInstrumentationInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
		method public abstract java.util.List<android.content.pm.IntentFilterVerificationInfo> getIntentFilterVerifications(java.lang.String);
		method public abstract int getIntentVerificationStatusAsUser(java.lang.String, int);
		@@ -11198,6 +11216,7 @@ package android.content.pm {
		field public static final int MATCH_DIRECT_BOOT_UNAWARE = 262144; // 0x40000
		field public static final int MATCH_DISABLED_COMPONENTS = 512; // 0x200
		field public static final int MATCH_DISABLED_UNTIL_USED_COMPONENTS = 32768; // 0x8000
		field public static final int MATCH_INSTANT = 8388608; // 0x800000
		field public static final int MATCH_SYSTEM_ONLY = 1048576; // 0x100000
		field public static final int MATCH_UNINSTALLED_PACKAGES = 8192; // 0x2000
		field public static final long MAXIMUM_VERIFICATION_TIMEOUT = 3600000L; // 0x36ee80L
		@@ -33736,6 +33755,7 @@ package android.os {
		method public boolean match(java.lang.String);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.os.PatternMatcher> CREATOR;
		field public static final int PATTERN_ADVANCED_GLOB = 3; // 0x3
		field public static final int PATTERN_LITERAL = 0; // 0x0
		field public static final int PATTERN_PREFIX = 1; // 0x1
		field public static final int PATTERN_SIMPLE_GLOB = 2; // 0x2
		@@ -43829,6 +43849,8 @@ package android.test.mock {
		method public java.lang.String getInstallerPackageName(java.lang.String);
		method public byte[] getInstantAppCookie();
		method public int getInstantAppCookieMaxSize();
		method public android.graphics.drawable.Drawable getInstantAppIcon(java.lang.String);
		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);

api/test-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -31144,6 +31144,7 @@ package android.os {
		method public boolean match(java.lang.String);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.os.PatternMatcher> CREATOR;
		field public static final int PATTERN_ADVANCED_GLOB = 3; // 0x3
		field public static final int PATTERN_LITERAL = 0; // 0x0
		field public static final int PATTERN_PREFIX = 1; // 0x1
		field public static final int PATTERN_SIMPLE_GLOB = 2; // 0x2

core/java/android/content/IntentFilter.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.content;

		import android.annotation.SystemApi;
		import android.net.Uri;
		import android.os.Parcel;
		import android.os.Parcelable;
		@@ -138,6 +139,7 @@ import java.util.Set;
		* will only match an Intent that does not have any categories.
		*/
		public class IntentFilter implements Parcelable {
		private static final String AGLOB_STR = "aglob";
		private static final String SGLOB_STR = "sglob";
		private static final String PREFIX_STR = "prefix";
		private static final String LITERAL_STR = "literal";
		@@ -482,11 +484,13 @@ public class IntentFilter implements Parcelable {
		}

		/** @hide */
		@SystemApi
		public final void setOrder(int order) {
		mOrder = order;
		}

		/** @hide */
		@SystemApi
		public final int getOrder() {
		return mOrder;
		}
		@@ -1594,6 +1598,9 @@ public class IntentFilter implements Parcelable {
		case PatternMatcher.PATTERN_SIMPLE_GLOB:
		serializer.attribute(null, SGLOB_STR, pe.getPath());
		break;
		case PatternMatcher.PATTERN_ADVANCED_GLOB:
		serializer.attribute(null, AGLOB_STR, pe.getPath());
		break;
		}
		serializer.endTag(null, SSP_STR);
		}
		@@ -1621,6 +1628,9 @@ public class IntentFilter implements Parcelable {
		case PatternMatcher.PATTERN_SIMPLE_GLOB:
		serializer.attribute(null, SGLOB_STR, pe.getPath());
		break;
		case PatternMatcher.PATTERN_ADVANCED_GLOB:
		serializer.attribute(null, AGLOB_STR, pe.getPath());
		break;
		}
		serializer.endTag(null, PATH_STR);
		}
		@@ -1673,6 +1683,8 @@ public class IntentFilter implements Parcelable {
		addDataSchemeSpecificPart(ssp, PatternMatcher.PATTERN_PREFIX);
		} else if ((ssp=parser.getAttributeValue(null, SGLOB_STR)) != null) {
		addDataSchemeSpecificPart(ssp, PatternMatcher.PATTERN_SIMPLE_GLOB);
		} else if ((ssp=parser.getAttributeValue(null, AGLOB_STR)) != null) {
		addDataSchemeSpecificPart(ssp, PatternMatcher.PATTERN_ADVANCED_GLOB);
		}
		} else if (tagName.equals(AUTH_STR)) {
		String host = parser.getAttributeValue(null, HOST_STR);
		@@ -1688,6 +1700,8 @@ public class IntentFilter implements Parcelable {
		addDataPath(path, PatternMatcher.PATTERN_PREFIX);
		} else if ((path=parser.getAttributeValue(null, SGLOB_STR)) != null) {
		addDataPath(path, PatternMatcher.PATTERN_SIMPLE_GLOB);
		} else if ((path=parser.getAttributeValue(null, AGLOB_STR)) != null) {
		addDataPath(path, PatternMatcher.PATTERN_ADVANCED_GLOB);
		}
		} else {
		Log.w("IntentFilter", "Unknown tag parsing IntentFilter: " + tagName);

core/java/android/content/pm/PackageManager.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -133,6 +133,7 @@ public abstract class PackageManager {
		MATCH_SYSTEM_ONLY,
		MATCH_FACTORY_ONLY,
		MATCH_DEBUG_TRIAGED_MISSING,
		MATCH_INSTANT,
		GET_DISABLED_COMPONENTS,
		GET_DISABLED_UNTIL_USED_COMPONENTS,
		GET_UNINSTALLED_PACKAGES,
		@@ -148,6 +149,7 @@ public abstract class PackageManager {
		MATCH_SYSTEM_ONLY,
		MATCH_DEBUG_TRIAGED_MISSING,
		MATCH_DISABLED_UNTIL_USED_COMPONENTS,
		MATCH_INSTANT,
		GET_DISABLED_UNTIL_USED_COMPONENTS,
		GET_UNINSTALLED_PACKAGES,
		})
		@@ -167,6 +169,7 @@ public abstract class PackageManager {
		MATCH_DIRECT_BOOT_UNAWARE,
		MATCH_SYSTEM_ONLY,
		MATCH_UNINSTALLED_PACKAGES,
		MATCH_INSTANT,
		GET_DISABLED_COMPONENTS,
		GET_DISABLED_UNTIL_USED_COMPONENTS,
		GET_UNINSTALLED_PACKAGES,
		@@ -188,6 +191,7 @@ public abstract class PackageManager {
		MATCH_DIRECT_BOOT_UNAWARE,
		MATCH_SYSTEM_ONLY,
		MATCH_UNINSTALLED_PACKAGES,
		MATCH_INSTANT,
		GET_DISABLED_COMPONENTS,
		GET_DISABLED_UNTIL_USED_COMPONENTS,
		GET_UNINSTALLED_PACKAGES,
		@@ -444,6 +448,7 @@ public abstract class PackageManager {
		* instant app. By default, instant app components are not matched.
		* @hide
		*/
		@SystemApi
		public static final int MATCH_INSTANT = 0x00800000;

		/**
		@@ -3739,6 +3744,7 @@ public abstract class PackageManager {
		*
		* @hide
		*/
		@SystemApi
		@RequiresPermission(Manifest.permission.ACCESS_INSTANT_APPS)
		public abstract @NonNull List<InstantAppInfo> getInstantApps();

		@@ -3749,6 +3755,7 @@ public abstract class PackageManager {
		*
		* @hide
		*/
		@SystemApi
		@RequiresPermission(Manifest.permission.ACCESS_INSTANT_APPS)
		public abstract @Nullable Drawable getInstantAppIcon(String packageName);