summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-01-31 17:41:09 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-31 17:41:09 -0800
commit6cf32312aaee6716ffd1df7098838b08d80054e4 (patch)
tree8b005ffc24e0dc2f8c8a6a2c482e2cd1b3aab837 /services
parent122106cb9be37fb97c0315b927771ec6fcb94aa4 (diff)
parent4c3915a0f73e51d0c70d93fe5b9ed125d5739b93 (diff)
downloadframeworks_base-6cf32312aaee6716ffd1df7098838b08d80054e4.zip
frameworks_base-6cf32312aaee6716ffd1df7098838b08d80054e4.tar.gz
frameworks_base-6cf32312aaee6716ffd1df7098838b08d80054e4.tar.bz2
Merge "Do not check features in PackageManagerService" into honeycomb
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/PackageManagerService.java20
1 files changed, 0 insertions, 20 deletions
diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java
index d75aef6..f3b5f4b 100644
--- a/services/java/com/android/server/PackageManagerService.java
+++ b/services/java/com/android/server/PackageManagerService.java
@@ -2924,26 +2924,6 @@ class PackageManagerService extends IPackageManager.Stub {
}
}
- if (pkg.reqFeatures != null) {
- int 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) {
suid = mSettings.getSharedUserLP(pkg.mSharedUserId,
pkg.applicationInfo.flags, true);