Merge "Fix issue #2749322: addPackageToPreferred throws SecurityException" into froyo

Dianne Hackborn · Android (Google) Code Review · commit d1d9047d5c34 · 2010-06-07T17:32:02.000-07:00
diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java
@@ -6593,15 +6593,11 @@ private boolean getPackageSizeInfoLI(String packageName, PackageStats pStats) {
 
 
     public void addPackageToPreferred(String packageName) {
-        mContext.enforceCallingOrSelfPermission(
-                android.Manifest.permission.SET_PREFERRED_APPLICATIONS, null);
-        Slog.w(TAG, "addPackageToPreferred: no longer implemented");
+        Slog.w(TAG, "addPackageToPreferred: this is now a no-op");
     }
 
     public void removePackageFromPreferred(String packageName) {
-        mContext.enforceCallingOrSelfPermission(
-                android.Manifest.permission.SET_PREFERRED_APPLICATIONS, null);
-        Slog.w(TAG, "removePackageFromPreferred: no longer implemented");
+        Slog.w(TAG, "removePackageFromPreferred: this is now a no-op");
     }
 
     public List<PackageInfo> getPreferredPackages(int flags) {

Original file line number	Diff line number	Diff line change
`@@ -6593,15 +6593,11 @@ private boolean getPackageSizeInfoLI(String packageName, PackageStats pStats) {`
`6593`	`6593`
`6594`	`6594`
`6595`	`6595`	`public void addPackageToPreferred(String packageName) {`
`6596`		`- mContext.enforceCallingOrSelfPermission(`
`6597`		`- android.Manifest.permission.SET_PREFERRED_APPLICATIONS, null);`
`6598`		`- Slog.w(TAG, "addPackageToPreferred: no longer implemented");`
	`6596`	`+ Slog.w(TAG, "addPackageToPreferred: this is now a no-op");`
`6599`	`6597`	`}`
`6600`	`6598`
`6601`	`6599`	`public void removePackageFromPreferred(String packageName) {`
`6602`		`- mContext.enforceCallingOrSelfPermission(`
`6603`		`- android.Manifest.permission.SET_PREFERRED_APPLICATIONS, null);`
`6604`		`- Slog.w(TAG, "removePackageFromPreferred: no longer implemented");`
	`6600`	`+ Slog.w(TAG, "removePackageFromPreferred: this is now a no-op");`
`6605`	`6601`	`}`
`6606`	`6602`
`6607`	`6603`	`public List<PackageInfo> getPreferredPackages(int flags) {`