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

Merge commit 'd1d9047d5c34fb05be08099fa8cd73e4301ee0ff' into kraken

* commit 'd1d9047d5c34fb05be08099fa8cd73e4301ee0ff':
  Fix issue #2749322: addPackageToPreferred throws SecurityException
This commit is contained in:
Dianne Hackborn
2010-06-07 18:32:04 -07:00
committed by Android Git Automerger

View File

@@ -6629,15 +6629,11 @@ class PackageManagerService extends IPackageManager.Stub {
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) {