diff options
| author | Dianne Hackborn <hackbod@google.com> | 2009-07-22 12:01:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-22 12:01:19 -0700 |
| commit | c00c04d7d8758a5ade185d465624e47dcf1bd7c0 (patch) | |
| tree | 9c7a9c99ecf9f6f29966efc65555066a65ee2dd5 /services | |
| parent | 8aea2f5f749e48ef0fe3532ab2fc258922c3239b (diff) | |
| parent | 11b822d2a91ea17c34c0cb1c11e80a9a30d72864 (diff) | |
| download | frameworks_base-c00c04d7d8758a5ade185d465624e47dcf1bd7c0.zip frameworks_base-c00c04d7d8758a5ade185d465624e47dcf1bd7c0.tar.gz frameworks_base-c00c04d7d8758a5ade185d465624e47dcf1bd7c0.tar.bz2 | |
am 11b822d2: Simplify density compatibility to a boolean.
Merge commit '11b822d2a91ea17c34c0cb1c11e80a9a30d72864'
* commit '11b822d2a91ea17c34c0cb1c11e80a9a30d72864':
Simplify density compatibility to a boolean.
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/PackageManagerService.java | 28 | ||||
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 3 |
2 files changed, 22 insertions, 9 deletions
diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java index 9c60157..d6cd4ef 100644 --- a/services/java/com/android/server/PackageManagerService.java +++ b/services/java/com/android/server/PackageManagerService.java @@ -4905,26 +4905,40 @@ class PackageManagerService extends IPackageManager.Stub { if (ps.pkg != null) { pw.print(" dataDir="); pw.println(ps.pkg.applicationInfo.dataDir); pw.print(" targetSdk="); pw.println(ps.pkg.applicationInfo.targetSdkVersion); - pw.print(" densities="); pw.println(ps.pkg.supportsDensityList); - ArrayList<String> screens = new ArrayList<String>(); + pw.print(" supportsScreens=["); + boolean first = true; if ((ps.pkg.applicationInfo.flags & ApplicationInfo.FLAG_SUPPORTS_NORMAL_SCREENS) != 0) { - screens.add("medium"); + if (!first) pw.print(", "); + first = false; + pw.print("medium"); } if ((ps.pkg.applicationInfo.flags & ApplicationInfo.FLAG_SUPPORTS_LARGE_SCREENS) != 0) { - screens.add("large"); + if (!first) pw.print(", "); + first = false; + pw.print("large"); } if ((ps.pkg.applicationInfo.flags & ApplicationInfo.FLAG_SUPPORTS_SMALL_SCREENS) != 0) { - screens.add("small,"); + if (!first) pw.print(", "); + first = false; + pw.print("small"); } if ((ps.pkg.applicationInfo.flags & ApplicationInfo.FLAG_RESIZEABLE_FOR_SCREENS) != 0) { - screens.add("resizeable,"); + if (!first) pw.print(", "); + first = false; + pw.print("resizeable"); + } + if ((ps.pkg.applicationInfo.flags & + ApplicationInfo.FLAG_SUPPORTS_SCREEN_DENSITIES) != 0) { + if (!first) pw.print(", "); + first = false; + pw.print("anyDensity"); } - pw.print(" supportsScreens="); pw.println(screens); } + pw.println("]"); pw.print(" timeStamp="); pw.println(ps.getTimeStampStr()); pw.print(" signatures="); pw.println(ps.signatures); pw.print(" permissionsFixed="); pw.print(ps.permissionsFixed); diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index e1ca201..7d4a2c2 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -184,8 +184,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen static final int LOG_BOOT_PROGRESS_ENABLE_SCREEN = 3050; // The flags that are set for all calls we make to the package manager. - static final int STOCK_PM_FLAGS = PackageManager.GET_SHARED_LIBRARY_FILES - | PackageManager.GET_SUPPORTS_DENSITIES; + static final int STOCK_PM_FLAGS = PackageManager.GET_SHARED_LIBRARY_FILES; private static final String SYSTEM_SECURE = "ro.secure"; |