Do not check features in PackageManagerService DO NOT MERGE
PackageManagerService shouldn't check features that a package declares that it uses because this will cause problems in the future when we add more features that older phones didn't explicitly declare. We must rely on markets to know about phones and filter them for us to avoid this situation. Bug: 3409434 Change-Id: I0d51b2de33d8110edc6824af4b5b8c901f96077f
This commit is contained in:
11
core/tests/coretests/apks/install_uses_feature/Android.mk
Normal file
11
core/tests/coretests/apks/install_uses_feature/Android.mk
Normal file
@@ -0,0 +1,11 @@
|
||||
LOCAL_PATH:= $(call my-dir)
|
||||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_MODULE_TAGS := tests
|
||||
|
||||
LOCAL_SRC_FILES := $(call all-subdir-java-files)
|
||||
|
||||
LOCAL_PACKAGE_NAME := FrameworkCoreTests_install_uses_feature
|
||||
|
||||
include $(BUILD_PACKAGE)
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2010 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.
|
||||
-->
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.android.frameworks.coretests.install_uses_feature">
|
||||
|
||||
<uses-feature android:name="com.android.frameworks.coretests.nonexistent" />
|
||||
|
||||
<application android:hasCode="false">
|
||||
</application>
|
||||
</manifest>
|
||||
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<!-- Just need this dummy file to have something to build. -->
|
||||
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
|
||||
<string name="dummy">dummy</string>
|
||||
</resources>
|
||||
BIN
core/tests/coretests/res/raw/install_uses_feature
Normal file
BIN
core/tests/coretests/res/raw/install_uses_feature
Normal file
Binary file not shown.
@@ -2838,6 +2838,23 @@ public class PackageManagerTests extends AndroidTestCase {
|
||||
installFromRawResource("install.apk", rapk2, PackageManager.INSTALL_REPLACE_EXISTING, true,
|
||||
fail, retCode, PackageInfo.INSTALL_LOCATION_UNSPECIFIED);
|
||||
}
|
||||
|
||||
/**
|
||||
* Unknown features should be allowed to install. This prevents older phones
|
||||
* from rejecting new packages that specify features that didn't exist when
|
||||
* an older phone existed. All older phones are assumed to have those
|
||||
* features.
|
||||
* <p>
|
||||
* Right now we allow all packages to be installed regardless of their
|
||||
* features.
|
||||
*/
|
||||
@LargeTest
|
||||
public void testUsesFeatureUnknownFeature() {
|
||||
int retCode = PackageManager.INSTALL_SUCCEEDED;
|
||||
installFromRawResource("install.apk", R.raw.install_uses_feature, 0, true, false, retCode,
|
||||
PackageInfo.INSTALL_LOCATION_UNSPECIFIED);
|
||||
}
|
||||
|
||||
/*---------- Recommended install location tests ----*/
|
||||
/*
|
||||
* TODO's
|
||||
|
||||
@@ -2926,27 +2926,6 @@ class PackageManagerService extends IPackageManager.Stub {
|
||||
System.arraycopy(mTmpSharedLibraries, 0,
|
||||
pkg.usesLibraryFiles, 0, num);
|
||||
}
|
||||
|
||||
if (pkg.reqFeatures != null) {
|
||||
N = pkg.reqFeatures.size();
|
||||
for (int i=0; i<N; i++) {
|
||||
FeatureInfo fi = pkg.reqFeatures.get(i);
|
||||
if ((fi.flags&FeatureInfo.FLAG_REQUIRED) == 0) {
|
||||
// Don't care.
|
||||
continue;
|
||||
}
|
||||
|
||||
if (fi.name != null) {
|
||||
if (mAvailableFeatures.get(fi.name) == null) {
|
||||
Slog.e(TAG, "Package " + pkg.packageName
|
||||
+ " requires unavailable feature "
|
||||
+ fi.name + "; failing!");
|
||||
mLastScanError = PackageManager.INSTALL_FAILED_MISSING_FEATURE;
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (pkg.mSharedUserId != null) {
|
||||
|
||||
Reference in New Issue
Block a user