drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e2585127: am 9ed7dc10: am 5886050f: Merge change I0d8f7593 into eclair

Browse Source 
Merge commit 'e2585127974ce972a013407e2af95d8776a99a8e'

* commit 'e2585127974ce972a013407e2af95d8776a99a8e':
  Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op
This commit is contained in:
Dianne Hackborn
2009-12-02 20:24:44 -08:00
committed by Android Git Automerger
parent 9495f8a154 e258512797
commit 8a1b6decfb
4 changed files with 18 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
services/java/com/android/server/PackageManagerService.java
View File

@ -2985,12 +2985,6 @@ class PackageManagerService extends IPackageManager.Stub {
TAG, "Removing package " + pkg.applicationInfo.packageName );
synchronized (mPackages) {
if (pkg.mPreferredOrder > 0) {
mSettings.mPreferredPackages.remove(pkg);
pkg.mPreferredOrder = 0;
updatePreferredIndicesLP();
}
clearPackagePreferredActivitiesLP(pkg.packageName);
mPackages.remove(pkg.applicationInfo.packageName);
@ -4969,62 +4963,17 @@ class PackageManagerService extends IPackageManager.Stub {
public void addPackageToPreferred(String packageName) {
mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.SET_PREFERRED_APPLICATIONS, null);
synchronized (mPackages) {
PackageParser.Package p = mPackages.get(packageName);
if (p == null) {
return;
}
PackageSetting ps = (PackageSetting)p.mExtras;
if (ps != null) {
mSettings.mPreferredPackages.remove(ps);
mSettings.mPreferredPackages.add(0, ps);
updatePreferredIndicesLP();
mSettings.writeLP();
}
}
Log.w(TAG, "addPackageToPreferred: no longer implemented");
}
public void removePackageFromPreferred(String packageName) {
mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.SET_PREFERRED_APPLICATIONS, null);
synchronized (mPackages) {
PackageParser.Package p = mPackages.get(packageName);
if (p == null) {
return;
}
if (p.mPreferredOrder > 0) {
PackageSetting ps = (PackageSetting)p.mExtras;
if (ps != null) {
mSettings.mPreferredPackages.remove(ps);
p.mPreferredOrder = 0;
updatePreferredIndicesLP();
mSettings.writeLP();
}
}
}
}
private void updatePreferredIndicesLP() {
final ArrayList<PackageSetting> pkgs
= mSettings.mPreferredPackages;
final int N = pkgs.size();
for (int i=0; i<N; i++) {
pkgs.get(i).pkg.mPreferredOrder = N - i;
}
Log.w(TAG, "removePackageFromPreferred: no longer implemented");
}
public List<PackageInfo> getPreferredPackages(int flags) {
synchronized (mPackages) {
final ArrayList<PackageInfo> res = new ArrayList<PackageInfo>();
final ArrayList<PackageSetting> pref = mSettings.mPreferredPackages;
final int N = pref.size();
for (int i=0; i<N; i++) {
res.add(generatePackageInfo(pref.get(i).pkg, flags));
}
return res;
}
return new ArrayList<PackageInfo>();
}
public void addPreferredActivity(IntentFilter filter, int match,
@ -5338,13 +5287,6 @@ class PackageManagerService extends IPackageManager.Stub {
pw.println("Preferred Activities:");
mSettings.mPreferredActivities.dump(pw, " ");
pw.println(" ");
pw.println("Preferred Packages:");
{
for (PackageSetting ps : mSettings.mPreferredPackages) {
pw.print(" "); pw.println(ps.name);
}
}
pw.println(" ");
pw.println("Permissions:");
{
for (BasePermission p : mSettings.mPermissions.values()) {
@ -6095,10 +6037,6 @@ class PackageManagerService extends IPackageManager.Stub {
private final File mBackupSettingsFilename;
private final HashMap<String, PackageSetting> mPackages =
new HashMap<String, PackageSetting>();
// The user's preferred packages/applications, in order of preference.
// First is the most preferred.
private final ArrayList<PackageSetting> mPreferredPackages =
new ArrayList<PackageSetting>();
// List of replaced system applications
final HashMap<String, PackageSetting> mDisabledSysPackages =
new HashMap<String, PackageSetting>();
@ -6143,9 +6081,6 @@ class PackageManagerService extends IPackageManager.Stub {
final HashMap<String, BasePermission> mPermissionTrees =
new HashMap<String, BasePermission>();
private final ArrayList<String> mPendingPreferredPackages
= new ArrayList<String>();
private final StringBuilder mReadMessages = new StringBuilder();
private static final class PendingPackage extends PackageSettingBase {
@ -6636,16 +6571,6 @@ class PackageManagerService extends IPackageManager.Stub {
writeDisabledSysPackage(serializer, pkg);
}
serializer.startTag(null, "preferred-packages");
int N = mPreferredPackages.size();
for (int i=0; i<N; i++) {
PackageSetting pkg = mPreferredPackages.get(i);
serializer.startTag(null, "item");
serializer.attribute(null, "name", pkg.name);
serializer.endTag(null, "item");
}
serializer.endTag(null, "preferred-packages");
serializer.startTag(null, "preferred-activities");
for (PreferredActivity pa : mPreferredActivities.filterSet()) {
serializer.startTag(null, "item");
@ -6923,7 +6848,7 @@ class PackageManagerService extends IPackageManager.Stub {
} else if (tagName.equals("shared-user")) {
readSharedUserLP(parser);
} else if (tagName.equals("preferred-packages")) {
readPreferredPackagesLP(parser);
// no longer used.
} else if (tagName.equals("preferred-activities")) {
readPreferredActivitiesLP(parser);
} else if(tagName.equals("updated-package")) {
@ -6977,19 +6902,6 @@ class PackageManagerService extends IPackageManager.Stub {
}
mPendingPackages.clear();
N = mPendingPreferredPackages.size();
mPreferredPackages.clear();
for (int i=0; i<N; i++) {
final String name = mPendingPreferredPackages.get(i);
final PackageSetting p = mPackages.get(name);
if (p != null) {
mPreferredPackages.add(p);
} else {
Log.w(TAG, "Unknown preferred package: " + name);
}
}
mPendingPreferredPackages.clear();
mReadMessages.append("Read completed successfully: "
+ mPackages.size() + " packages, "
+ mSharedUsers.size() + " shared uids\n");
@ -7448,37 +7360,6 @@ class PackageManagerService extends IPackageManager.Stub {
}
}
private void readPreferredPackagesLP(XmlPullParser parser)
throws XmlPullParserException, IOException {
int outerDepth = parser.getDepth();
int type;
while ((type=parser.next()) != XmlPullParser.END_DOCUMENT
&& (type != XmlPullParser.END_TAG
|| parser.getDepth() > outerDepth)) {
if (type == XmlPullParser.END_TAG
|| type == XmlPullParser.TEXT) {
continue;
}
String tagName = parser.getName();
if (tagName.equals("item")) {
String name = parser.getAttributeValue(null, "name");
if (name != null) {
mPendingPreferredPackages.add(name);
} else {
reportSettingsProblem(Log.WARN,
"Error in package manager settings: <preferred-package> has no name at "
+ parser.getPositionDescription());
}
} else {
reportSettingsProblem(Log.WARN,
"Unknown element under <preferred-packages>: "
+ parser.getName());
}
XmlUtils.skipCurrentTag(parser);
}
}
private void readPreferredActivitiesLP(XmlPullParser parser)
throws XmlPullParserException, IOException {
int outerDepth = parser.getDepth();