Merge "Add feature versions for devices and apps." into nyc-dev am: 9c6d9753a0 (5cb5f097) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -1376,6 +1376,7 @@ package android {
		field public static final int valueType = 16843488; // 0x10102e0
		field public static final int variablePadding = 16843157; // 0x1010195
		field public static final int vendor = 16843751; // 0x10103e7
		field public static final int version = 16844058; // 0x101051a
		field public static final int versionCode = 16843291; // 0x101021b
		field public static final int versionName = 16843292; // 0x101021c
		field public static final int verticalCorrection = 16843322; // 0x101023a
		@@ -9403,6 +9404,7 @@ package android.content.pm {
		field public int flags;
		field public java.lang.String name;
		field public int reqGlEsVersion;
		field public int version;
		}

		public class InstrumentationInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {
		@@ -9681,6 +9683,7 @@ package android.content.pm {
		method public abstract java.lang.CharSequence getUserBadgedLabel(java.lang.CharSequence, android.os.UserHandle);
		method public abstract android.content.res.XmlResourceParser getXml(java.lang.String, int, android.content.pm.ApplicationInfo);
		method public abstract boolean hasSystemFeature(java.lang.String);
		method public abstract boolean hasSystemFeature(java.lang.String, int);
		method public abstract boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);
		method public abstract boolean isSafeMode();
		method public abstract java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int);
		@@ -37794,6 +37797,7 @@ package android.test.mock {
		method public java.lang.CharSequence getUserBadgedLabel(java.lang.CharSequence, android.os.UserHandle);
		method public android.content.res.XmlResourceParser getXml(java.lang.String, int, android.content.pm.ApplicationInfo);
		method public boolean hasSystemFeature(java.lang.String);
		method public boolean hasSystemFeature(java.lang.String, int);
		method public boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);
		method public boolean isSafeMode();
		method public java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int);

api/system-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -1475,6 +1475,7 @@ package android {
		field public static final int valueType = 16843488; // 0x10102e0
		field public static final int variablePadding = 16843157; // 0x1010195
		field public static final int vendor = 16843751; // 0x10103e7
		field public static final int version = 16844058; // 0x101051a
		field public static final int versionCode = 16843291; // 0x101021b
		field public static final int versionName = 16843292; // 0x101021c
		field public static final int verticalCorrection = 16843322; // 0x101023a
		@@ -9748,6 +9749,7 @@ package android.content.pm {
		field public int flags;
		field public java.lang.String name;
		field public int reqGlEsVersion;
		field public int version;
		}

		public class InstrumentationInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {
		@@ -10030,6 +10032,7 @@ package android.content.pm {
		method public abstract android.content.res.XmlResourceParser getXml(java.lang.String, int, android.content.pm.ApplicationInfo);
		method public abstract void grantRuntimePermission(java.lang.String, java.lang.String, android.os.UserHandle);
		method public abstract boolean hasSystemFeature(java.lang.String);
		method public abstract boolean hasSystemFeature(java.lang.String, int);
		method public abstract boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);
		method public abstract boolean isSafeMode();
		method public abstract java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int);
		@@ -40543,6 +40546,7 @@ package android.test.mock {
		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 boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);
		method public boolean isSafeMode();
		method public java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int);

api/test-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -1376,6 +1376,7 @@ package android {
		field public static final int valueType = 16843488; // 0x10102e0
		field public static final int variablePadding = 16843157; // 0x1010195
		field public static final int vendor = 16843751; // 0x10103e7
		field public static final int version = 16844058; // 0x101051a
		field public static final int versionCode = 16843291; // 0x101021b
		field public static final int versionName = 16843292; // 0x101021c
		field public static final int verticalCorrection = 16843322; // 0x101023a
		@@ -9410,6 +9411,7 @@ package android.content.pm {
		field public int flags;
		field public java.lang.String name;
		field public int reqGlEsVersion;
		field public int version;
		}

		public class InstrumentationInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {
		@@ -9689,6 +9691,7 @@ package android.content.pm {
		method public abstract java.lang.CharSequence getUserBadgedLabel(java.lang.CharSequence, android.os.UserHandle);
		method public abstract android.content.res.XmlResourceParser getXml(java.lang.String, int, android.content.pm.ApplicationInfo);
		method public abstract boolean hasSystemFeature(java.lang.String);
		method public abstract boolean hasSystemFeature(java.lang.String, int);
		method public abstract boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);
		method public abstract boolean isSafeMode();
		method public abstract java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int);
		@@ -37811,6 +37814,7 @@ package android.test.mock {
		method public java.lang.CharSequence getUserBadgedLabel(java.lang.CharSequence, android.os.UserHandle);
		method public android.content.res.XmlResourceParser getXml(java.lang.String, int, android.content.pm.ApplicationInfo);
		method public boolean hasSystemFeature(java.lang.String);
		method public boolean hasSystemFeature(java.lang.String, int);
		method public boolean isPermissionRevokedByPolicy(java.lang.String, java.lang.String);
		method public boolean isSafeMode();
		method public java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(android.content.Intent, int);

cmds/svc/src/com/android/commands/svc/NfcCommand.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ public class NfcCommand extends Svc.Command {
		IPackageManager pm = IPackageManager.Stub.asInterface(
		ServiceManager.getService("package"));
		try {
		if (pm.hasSystemFeature(PackageManager.FEATURE_NFC)) {
		if (pm.hasSystemFeature(PackageManager.FEATURE_NFC, 0)) {
		INfcAdapter nfc = INfcAdapter.Stub
		.asInterface(ServiceManager.getService(Context.NFC_SERVICE));
		try {

core/java/android/app/ApplicationPackageManager.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -450,8 +450,13 @@ public class ApplicationPackageManager extends PackageManager {

		@Override
		public boolean hasSystemFeature(String name) {
		return hasSystemFeature(name, 0);
		}

		@Override
		public boolean hasSystemFeature(String name, int version) {
		try {
		return mPM.hasSystemFeature(name);
		return mPM.hasSystemFeature(name, version);
		} catch (RemoteException e) {
		throw new RuntimeException("Package manager has died", e);
		}