PackageManager: Remove unused methods and more debug flags (4dfe6ff6) · Commits · e / os / android_frameworks_base

services/java/com/android/server/PackageManagerService.java

+41 −51

Original line number	Original line	Diff line number	Diff line
	@@ -70,7 +70,6 @@ import android.net.Uri;
	import android.os.Binder;		import android.os.Binder;
	import android.os.Build;		import android.os.Build;
	import android.os.Bundle;		import android.os.Bundle;
	import android.os.Debug;
	import android.os.Environment;		import android.os.Environment;
	import android.os.FileObserver;		import android.os.FileObserver;
	import android.os.FileUtils;		import android.os.FileUtils;
	@@ -87,7 +86,6 @@ import android.os.ServiceManager;
	import android.os.SystemClock;		import android.os.SystemClock;
	import android.os.SystemProperties;		import android.os.SystemProperties;
	import android.security.SystemKeyStore;		import android.security.SystemKeyStore;
	import android.util.Config;
	import android.util.DisplayMetrics;		import android.util.DisplayMetrics;
	import android.util.EventLog;		import android.util.EventLog;
	import android.util.Log;		import android.util.Log;
	@@ -1984,11 +1982,9 @@ class PackageManagerService extends IPackageManager.Stub {
	// then let the user decide between them.		// then let the user decide between them.
	ResolveInfo r0 = query.get(0);		ResolveInfo r0 = query.get(0);
	ResolveInfo r1 = query.get(1);		ResolveInfo r1 = query.get(1);
	if (false) {		if (DEBUG_INTENT_MATCHING) {
	System.out.println(r0.activityInfo.name +		Log.d(TAG, r0.activityInfo.name + "=" + r0.priority + " vs "
	"=" + r0.priority + " vs " +		+ r1.activityInfo.name + "=" + r1.priority);
	r1.activityInfo.name +
	"=" + r1.priority);
	}		}
	// If the first activity has a higher priority, or a different		// If the first activity has a higher priority, or a different
	// default, then it is always desireable to pick it.		// default, then it is always desireable to pick it.
	@@ -2519,7 +2515,7 @@ class PackageManagerService extends IPackageManager.Stub {
	return;		return;
	}		}

	if (false) {		if (DEBUG_PACKAGE_SCANNING) {
	Log.d(TAG, "Scanning app dir " + dir);		Log.d(TAG, "Scanning app dir " + dir);
	}		}

	@@ -2872,8 +2868,11 @@ class PackageManagerService extends IPackageManager.Stub {
	}		}
	}		}

	if (DEBUG_PACKAGE_SCANNING && (parseFlags&PackageParser.PARSE_CHATTY) != 0) Log.d(		if (DEBUG_PACKAGE_SCANNING) {
	TAG, "Scanning package " + pkg.packageName);		if ((parseFlags & PackageParser.PARSE_CHATTY) != 0)
			Log.d(TAG, "Scanning package " + pkg.packageName);
			}

	if (mPackages.containsKey(pkg.packageName)		if (mPackages.containsKey(pkg.packageName)
	\|\| mSharedLibraries.containsKey(pkg.packageName)) {		\|\| mSharedLibraries.containsKey(pkg.packageName)) {
	Slog.w(TAG, "Application package " + pkg.packageName		Slog.w(TAG, "Application package " + pkg.packageName
	@@ -2945,9 +2944,10 @@ class PackageManagerService extends IPackageManager.Stub {
	mLastScanError = PackageManager.INSTALL_FAILED_INSUFFICIENT_STORAGE;		mLastScanError = PackageManager.INSTALL_FAILED_INSUFFICIENT_STORAGE;
	return null;		return null;
	}		}
	if (DEBUG_PACKAGE_SCANNING && (parseFlags & PackageParser.PARSE_CHATTY) != 0) {		if (DEBUG_PACKAGE_SCANNING) {
	Log.d(TAG, "Shared UserID " + pkg.mSharedUserId + " (uid="		if ((parseFlags & PackageParser.PARSE_CHATTY) != 0)
	+ suid.userId + "): packages=" + suid.packages);		Log.d(TAG, "Shared UserID " + pkg.mSharedUserId + " (uid=" + suid.userId
			+ "): packages=" + suid.packages);
	}		}
	}		}

	@@ -3199,8 +3199,10 @@ class PackageManagerService extends IPackageManager.Stub {
	}		}
	pkg.applicationInfo.dataDir = dataPath.getPath();		pkg.applicationInfo.dataDir = dataPath.getPath();
	} else {		} else {
	if (DEBUG_PACKAGE_SCANNING && (parseFlags & PackageParser.PARSE_CHATTY) != 0)		if (DEBUG_PACKAGE_SCANNING) {
			if ((parseFlags & PackageParser.PARSE_CHATTY) != 0)
	Log.v(TAG, "Want this data dir: " + dataPath);		Log.v(TAG, "Want this data dir: " + dataPath);
			}
	//invoke installer to do the actual installation		//invoke installer to do the actual installation
	if (mInstaller != null) {		if (mInstaller != null) {
	int ret = mInstaller.install(pkgName, pkg.applicationInfo.uid,		int ret = mInstaller.install(pkgName, pkg.applicationInfo.uid,
	@@ -3380,11 +3382,12 @@ class PackageManagerService extends IPackageManager.Stub {
	} else {		} else {
	p.info.authority = p.info.authority + ";" + names[j];		p.info.authority = p.info.authority + ";" + names[j];
	}		}
	if (DEBUG_PACKAGE_SCANNING		if (DEBUG_PACKAGE_SCANNING) {
	&& (parseFlags & PackageParser.PARSE_CHATTY) != 0)		if ((parseFlags & PackageParser.PARSE_CHATTY) != 0)
	Log.d(TAG, "Registered content provider: " + names[j] +		Log.d(TAG, "Registered content provider: " + names[j]
	", className = " + p.info.name +		+ ", className = " + p.info.name + ", isSyncable = "
	", isSyncable = " + p.info.isSyncable);		+ p.info.isSyncable);
			}
	} else {		} else {
	PackageParser.Provider other = mProviders.get(names[j]);		PackageParser.Provider other = mProviders.get(names[j]);
	Slog.w(TAG, "Skipping provider name " + names[j] +		Slog.w(TAG, "Skipping provider name " + names[j] +
	@@ -3630,8 +3633,10 @@ class PackageManagerService extends IPackageManager.Stub {
	}		}

	void removePackageLI(PackageParser.Package pkg, boolean chatty) {		void removePackageLI(PackageParser.Package pkg, boolean chatty) {
	if (DEBUG_INSTALL && chatty)		if (DEBUG_INSTALL) {
			if (chatty)
	Log.d(TAG, "Removing package " + pkg.applicationInfo.packageName);		Log.d(TAG, "Removing package " + pkg.applicationInfo.packageName);
			}

	synchronized (mPackages) {		synchronized (mPackages) {
	clearPackagePreferredActivitiesLP(pkg.packageName);		clearPackagePreferredActivitiesLP(pkg.packageName);
	@@ -3660,10 +3665,12 @@ class PackageManagerService extends IPackageManager.Stub {
	for (int j = 0; j < names.length; j++) {		for (int j = 0; j < names.length; j++) {
	if (mProviders.get(names[j]) == p) {		if (mProviders.get(names[j]) == p) {
	mProviders.remove(names[j]);		mProviders.remove(names[j]);
	if (DEBUG_REMOVE && chatty) Log.d(		if (DEBUG_REMOVE) {
	TAG, "Unregistered content provider: " + names[j] +		if (chatty)
	", className = " + p.info.name +		Log.d(TAG, "Unregistered content provider: " + names[j]
	", isSyncable = " + p.info.isSyncable);		+ ", className = " + p.info.name + ", isSyncable = "
			+ p.info.isSyncable);
			}
	}		}
	}		}
	if (chatty) {		if (chatty) {
	@@ -3898,10 +3905,9 @@ class PackageManagerService extends IPackageManager.Stub {
	for (int i=0; i<N; i++) {		for (int i=0; i<N; i++) {
	String name = pkg.requestedPermissions.get(i);		String name = pkg.requestedPermissions.get(i);
	BasePermission bp = mSettings.mPermissions.get(name);		BasePermission bp = mSettings.mPermissions.get(name);
	if (false) {		if (DEBUG_INSTALL) {
	if (gp != ps) {		if (gp != ps) {
	Log.i(TAG, "Package " + pkg.packageName + " checking " + name		Log.i(TAG, "Package " + pkg.packageName + " checking " + name + ": " + bp);
	+ ": " + bp);
	}		}
	}		}
	if (bp != null && bp.packageSetting != null) {		if (bp != null && bp.packageSetting != null) {
	@@ -3947,7 +3953,7 @@ class PackageManagerService extends IPackageManager.Stub {
	} else {		} else {
	allowed = false;		allowed = false;
	}		}
	if (false) {		if (DEBUG_INSTALL) {
	if (gp != ps) {		if (gp != ps) {
	Log.i(TAG, "Package " + pkg.packageName + " granting " + perm);		Log.i(TAG, "Package " + pkg.packageName + " granting " + perm);
	}		}
	@@ -6100,8 +6106,7 @@ class PackageManagerService extends IPackageManager.Stub {
	}		}

	if (retCode != 0) {		if (retCode != 0) {
	Slog.e(TAG, "Couldn't set new package file permissions for " +		Slog.e(TAG, "Couldn't set new package file permissions for " + newPackage.mPath
	newPackage.mPath
	+ ". The return code was: " + retCode);		+ ". The return code was: " + retCode);
	// TODO Define new internal error		// TODO Define new internal error
	return PackageManager.INSTALL_FAILED_INSUFFICIENT_STORAGE;		return PackageManager.INSTALL_FAILED_INSUFFICIENT_STORAGE;
	@@ -7020,8 +7025,9 @@ class PackageManagerService extends IPackageManager.Stub {

	private void sendPackageChangedBroadcast(String packageName,		private void sendPackageChangedBroadcast(String packageName,
	boolean killFlag, ArrayList<String> componentNames, int packageUid) {		boolean killFlag, ArrayList<String> componentNames, int packageUid) {
	if (false) Log.v(TAG, "Sending package changed: package=" + packageName		if (DEBUG_INSTALL)
	+ " components=" + componentNames);		Log.v(TAG, "Sending package changed: package=" + packageName + " components="
			+ componentNames);
	Bundle extras = new Bundle(4);		Bundle extras = new Bundle(4);
	extras.putString(Intent.EXTRA_CHANGED_COMPONENT_NAME, componentNames.get(0));		extras.putString(Intent.EXTRA_CHANGED_COMPONENT_NAME, componentNames.get(0));
	String nameList[] = new String[componentNames.size()];		String nameList[] = new String[componentNames.size()];
	@@ -8632,17 +8638,6 @@ class PackageManagerService extends IPackageManager.Stub {
	}		}
	}		}

	private Set<String> findPackagesWithFlag(int flag) {
	Set<String> ret = new HashSet<String>();
	for (PackageSetting ps : mPackages.values()) {
	// Has to match atleast all the flag bits set on flag
	if ((ps.pkgFlags & flag) == flag) {
	ret.add(ps.name);
	}
	}
	return ret;
	}

	private void removeUserIdLP(int uid) {		private void removeUserIdLP(int uid) {
	if (uid >= FIRST_APPLICATION_UID) {		if (uid >= FIRST_APPLICATION_UID) {
	final int N = mUserIds.size();		final int N = mUserIds.size();
	@@ -9190,10 +9185,6 @@ class PackageManagerService extends IPackageManager.Stub {
	}		}
	}		}

	String getReadMessagesLP() {
	return mReadMessages.toString();
	}

	ArrayList<PackageSetting> getListOfIncompleteInstallPackages() {		ArrayList<PackageSetting> getListOfIncompleteInstallPackages() {
	HashSet<String> kList = new HashSet<String>(mPackages.keySet());		HashSet<String> kList = new HashSet<String>(mPackages.keySet());
	Iterator<String> its = kList.iterator();		Iterator<String> its = kList.iterator();
	@@ -10285,7 +10276,6 @@ class PackageManagerService extends IPackageManager.Stub {
	ArrayList<SdInstallArgs> failedList = new ArrayList<SdInstallArgs>();		ArrayList<SdInstallArgs> failedList = new ArrayList<SdInstallArgs>();
	final Set<SdInstallArgs> keys = processCids.keySet();		final Set<SdInstallArgs> keys = processCids.keySet();
	for (SdInstallArgs args : keys) {		for (SdInstallArgs args : keys) {
	String cid = args.cid;
	String pkgName = args.getPackageName();		String pkgName = args.getPackageName();
	if (DEBUG_SD_INSTALL) Log.i(TAG, "Trying to unload pkg : " + pkgName);		if (DEBUG_SD_INSTALL) Log.i(TAG, "Trying to unload pkg : " + pkgName);
	// Delete package internally		// Delete package internally