summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2014-08-08 17:32:44 -0700
committerAdam Lesinski <adamlesinski@google.com>2014-08-15 15:53:35 -0700
commitd3edfde51bd069a63e820282421d1a534fcf00ce (patch)
tree9974d53c7ff2edc8577fd45066844de166fae7ed /api
parent4482e4bb8d1f5fe586b641bc3d6298dc7b8fee80 (diff)
downloadframeworks_base-d3edfde51bd069a63e820282421d1a534fcf00ce.zip
frameworks_base-d3edfde51bd069a63e820282421d1a534fcf00ce.tar.gz
frameworks_base-d3edfde51bd069a63e820282421d1a534fcf00ce.tar.bz2
Add FeatureGroup to PackageInfo
FeatureGroups replace top-level FeatureInfo objects. FeatureGroups inherit top-level FeatureInfos but override them if the feature names are the same. Bug:16822121 Change-Id: I80b2cb778a0fbcb4521efce986fba641e0914290
Diffstat (limited to 'api')
-rw-r--r--api/current.txt10
1 files changed, 10 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 8278caf..b75c11a0 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -8526,6 +8526,15 @@ package android.content.pm {
field public int reqTouchScreen;
}
+ public final class FeatureGroupInfo implements android.os.Parcelable {
+ ctor public FeatureGroupInfo();
+ ctor public FeatureGroupInfo(android.content.pm.FeatureGroupInfo);
+ method public int describeContents();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final android.os.Parcelable.Creator CREATOR;
+ field public android.content.pm.FeatureInfo[] features;
+ }
+
public class FeatureInfo implements android.os.Parcelable {
ctor public FeatureInfo();
ctor public FeatureInfo(android.content.pm.FeatureInfo);
@@ -8647,6 +8656,7 @@ package android.content.pm {
field public android.content.pm.ActivityInfo[] activities;
field public android.content.pm.ApplicationInfo applicationInfo;
field public android.content.pm.ConfigurationInfo[] configPreferences;
+ field public android.content.pm.FeatureGroupInfo[] featureGroups;
field public long firstInstallTime;
field public int[] gids;
field public int installLocation;