diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-08-08 17:32:44 -0700 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2014-08-15 15:53:35 -0700 |
| commit | d3edfde51bd069a63e820282421d1a534fcf00ce (patch) | |
| tree | 9974d53c7ff2edc8577fd45066844de166fae7ed /tests/UsesFeature2Test | |
| parent | 4482e4bb8d1f5fe586b641bc3d6298dc7b8fee80 (diff) | |
| download | frameworks_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 'tests/UsesFeature2Test')
| -rw-r--r-- | tests/UsesFeature2Test/AndroidManifest.xml | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/tests/UsesFeature2Test/AndroidManifest.xml b/tests/UsesFeature2Test/AndroidManifest.xml index 6b6c4da..8caf4a1 100644 --- a/tests/UsesFeature2Test/AndroidManifest.xml +++ b/tests/UsesFeature2Test/AndroidManifest.xml @@ -33,12 +33,5 @@ <uses-feature android:name="android.hardware.opengles.aep" /> </feature-group> - <application android:label="@string/app_title"> - <activity android:name="ActivityMain"> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - </activity> - </application> + <application android:label="@string/app_title" android:hasCode="false" /> </manifest> |