Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 115d2c18 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Add feature versions for devices and apps. 

We're starting to see more instances of device features that will
increment separately from the SDK API level, such as camera HAL,
GPU capabilities, Bluetooth, and other hardware standards.

This change adds the ability for device features to specify a
version, which is defined to be backwards compatible.  That is, apps
requesting an older version of a feature must continue working on
devices with a newer version of that same feature.

When a version is undefined, we assume the default version "0".

Bug: 27162500
Change-Id: If890bf3f3dbb715e8feb80e7059a0d65618482ea
parent c6ca2659

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
@@ -9400,6 +9401,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 {










@@ -9678,6 +9680,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);










@@ -37789,6 +37792,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










@@ -9745,6 +9746,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 {










@@ -10027,6 +10029,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);










@@ -40538,6 +40541,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










@@ -9407,6 +9408,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 {










@@ -9686,6 +9688,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);










@@ -37806,6 +37809,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);















        }