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

Commit 49237345 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Add platform infrastructure for features. 

This introduces a new mechanism to define features associated with
a platform, query the current device for the available features,
and enforce that apps requiring features that aren't available can't
be installed.

Also now allows uses-library to specify that a library is optional,
so the lack of such a library will not prevent the app from being
installed (but if it does exist it will be correctly linked into
the app).

Change-Id: I5b369b46cfa0b3d37c9e08fd14ef1098a978e67b
parent 5511c669

api/current.xml

+161 −0
Original line number Diff line number Diff line
@@ -37589,6 +37589,134 @@ 
>

</field>

</class>

<class name="FeatureInfo"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<implements name="android.os.Parcelable">

</implements>

<constructor name="FeatureInfo"

 type="android.content.pm.FeatureInfo"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</constructor>

<constructor name="FeatureInfo"

 type="android.content.pm.FeatureInfo"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="orig" type="android.content.pm.FeatureInfo">

</parameter>

</constructor>

<method name="describeContents"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getGlEsVersion"

 return="java.lang.String"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="writeToParcel"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="dest" type="android.os.Parcel">

</parameter>

<parameter name="parcelableFlags" type="int">

</parameter>

</method>

<field name="CREATOR"

 type="android.os.Parcelable.Creator"

 transient="false"

 volatile="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="FLAG_REQUIRED"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="GL_ES_VERSION_UNDEFINED"

 type="int"

 transient="false"

 volatile="false"

 value="0"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="flags"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="name"

 type="java.lang.String"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="reqGlEsVersion"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="InstrumentationInfo"

 extends="android.content.pm.PackageItemInfo"

 abstract="false"
@@ -37850,6 +37978,17 @@ 
 visibility="public"

>

</field>

<field name="reqFeatures"

 type="android.content.pm.FeatureInfo[]"

 transient="false"

 volatile="false"

 value="null"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="requestedPermissions"

 type="java.lang.String[]"

 transient="false"
@@ -38719,6 +38858,17 @@ 
<exception name="PackageManager.NameNotFoundException" type="android.content.pm.PackageManager.NameNotFoundException">

</exception>

</method>

<method name="getSystemAvailableFeatures"

 return="android.content.pm.FeatureInfo[]"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getSystemSharedLibraryNames"

 return="java.lang.String[]"

 abstract="true"
@@ -122943,6 +123093,17 @@ 
<exception name="PackageManager.NameNotFoundException" type="android.content.pm.PackageManager.NameNotFoundException">

</exception>

</method>

<method name="getSystemAvailableFeatures"

 return="android.content.pm.FeatureInfo[]"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getSystemSharedLibraryNames"

 return="java.lang.String[]"

 abstract="false"

core/java/android/app/ApplicationContext.java

+10 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import android.content.SharedPreferences; 
import android.content.pm.ActivityInfo;

import android.content.pm.ApplicationInfo;

import android.content.pm.ComponentInfo;

import android.content.pm.FeatureInfo;

import android.content.pm.IPackageDataObserver;

import android.content.pm.IPackageDeleteObserver;

import android.content.pm.IPackageInstallObserver;
@@ -1622,6 +1623,15 @@ class ApplicationContext extends Context { 
             }

        }



        @Override

        public FeatureInfo[] getSystemAvailableFeatures() {

            try {

                return mPM.getSystemAvailableFeatures();

            } catch (RemoteException e) {

                throw new RuntimeException("Package manager has died", e);

            }

        }

        

        @Override

        public int checkPermission(String permName, String pkgName) {

            try {

core/java/android/content/pm/ConfigurationInfo.java

+8 −8
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import android.os.Parcelable; 
/**

 * Information you can retrieve about hardware configuration preferences

 * declared by an application. This corresponds to information collected from the

 * AndroidManifest.xml's &lt;uses-configuration&gt; and the   &lt;uses-feature&gt;tags.

 * AndroidManifest.xml's &lt;uses-configuration&gt; and &lt;uses-feature&gt; tags.

 */

public class ConfigurationInfo implements Parcelable {

    /**
@@ -92,13 +92,13 @@ public class ConfigurationInfo implements Parcelable { 
    }



    public String toString() {

        return "ApplicationHardwarePreferences{"

        return "ConfigurationInfo{"

            + Integer.toHexString(System.identityHashCode(this))

            + ", touchscreen = " + reqTouchScreen + "}"

            + ", inputMethod = " + reqKeyboardType + "}"

            + ", navigation = " + reqNavigation + "}"

            + ", reqInputFeatures = " + reqInputFeatures + "}"

            + ", reqGlEsVersion = " + reqGlEsVersion + "}";

            + " touchscreen = " + reqTouchScreen

            + " inputMethod = " + reqKeyboardType

            + " navigation = " + reqNavigation

            + " reqInputFeatures = " + reqInputFeatures

            + " reqGlEsVersion = " + reqGlEsVersion + "}";

    }



    public int describeContents() {

core/java/android/content/pm/FeatureInfo.aidl

0 → 100755
+19 −0
Original line number Diff line number Diff line 
/*

** Copyright 2009, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License"); 

** you may not use this file except in compliance with the License. 

** You may obtain a copy of the License at 

**

**     http://www.apache.org/licenses/LICENSE-2.0 

**

** Unless required by applicable law or agreed to in writing, software 

** distributed under the License is distributed on an "AS IS" BASIS, 

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 

** See the License for the specific language governing permissions and 

** limitations under the License.

*/



package android.content.pm;



parcelable FeatureInfo;

core/java/android/content/pm/FeatureInfo.java

0 → 100644
+101 −0
Original line number Diff line number Diff line 
package android.content.pm;



import android.os.Parcel;

import android.os.Parcelable;

import android.os.Parcelable.Creator;



/**

 * A single feature that can be requested by an application. This corresponds

 * to information collected from the

 * AndroidManifest.xml's &lt;uses-feature&gt; tag.

 */

public class FeatureInfo implements Parcelable {

    /**

     * The name of this feature, for example "android.hardware.camera".  If

     * this is null, then this is an OpenGL ES version feature as described

     * in {@link #reqGlEsVersion}.

     */

    public String name;

    

    /**

     * Default value for {@link #reqGlEsVersion};

     */

    public static final int GL_ES_VERSION_UNDEFINED = 0;

    

    /**

     * The GLES version used by an application. The upper order 16 bits represent the

     * major version and the lower order 16 bits the minor version.  Only valid

     * if {@link #name} is null.

     */

    public int reqGlEsVersion;



    /**

     * Set on {@link #flags} if this feature has been required by the application.

     */

    public static final int FLAG_REQUIRED = 0x0001;

    

    /**

     * Additional flags.  May be zero or more of {@link #FLAG_REQUIRED}.

     */

    public int flags;

    

    public FeatureInfo() {

    }



    public FeatureInfo(FeatureInfo orig) {

        name = orig.name;

        reqGlEsVersion = orig.reqGlEsVersion;

        flags = orig.flags;

    }



    public String toString() {

        if (name != null) {

            return "FeatureInfo{"

                    + Integer.toHexString(System.identityHashCode(this))

                    + " " + name + " fl=0x" + Integer.toHexString(flags) + "}";

        } else {

            return "FeatureInfo{"

                    + Integer.toHexString(System.identityHashCode(this))

                    + " glEsVers=" + getGlEsVersion()

                    + " fl=0x" + Integer.toHexString(flags) + "}";

        }

    }



    public int describeContents() {

        return 0;

    }



    public void writeToParcel(Parcel dest, int parcelableFlags) {

        dest.writeString(name);

        dest.writeInt(reqGlEsVersion);

        dest.writeInt(flags);

    }



    public static final Creator<FeatureInfo> CREATOR =

        new Creator<FeatureInfo>() {

        public FeatureInfo createFromParcel(Parcel source) {

            return new FeatureInfo(source);

        }

        public FeatureInfo[] newArray(int size) {

            return new FeatureInfo[size];

        }

    };



    private FeatureInfo(Parcel source) {

        name = source.readString();

        reqGlEsVersion = source.readInt();

        flags = source.readInt();

    }



    /**

     * This method extracts the major and minor version of reqGLEsVersion attribute

     * and returns it as a string. Say reqGlEsVersion value of 0x00010002 is returned

     * as 1.2

     * @return String representation of the reqGlEsVersion attribute

     */

    public String getGlEsVersion() {

        int major = ((reqGlEsVersion & 0xffff0000) >> 16);

        int minor = reqGlEsVersion & 0x0000ffff;

        return String.valueOf(major)+"."+String.valueOf(minor);

    }

}