Merge "Clear default-browser state when it's uninstalled" into oc-dev (6338cd81) · Commits · e / os / android_frameworks_base

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

+10 −6

Original line number	Diff line number	Diff line
		@@ -14118,9 +14118,6 @@ public class PackageManagerService extends IPackageManager.Stub
		synchronized (mPackages) {
		boolean result = mSettings.setDefaultBrowserPackageNameLPw(packageName, userId);
		if (packageName != null) {
		result \|= updateIntentVerificationStatus(packageName,
		PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS,
		userId);
		mDefaultPermissionPolicy.grantDefaultPermissionsToDefaultBrowserLPr(
		packageName, userId);
		}
		@@ -18589,6 +18586,7 @@ public class PackageManagerService extends IPackageManager.Stub
		destroyAppDataLIF(pkg, userId,
		StorageManager.FLAG_STORAGE_DE \| StorageManager.FLAG_STORAGE_CE);
		destroyAppProfilesLIF(pkg, userId);
		clearDefaultBrowserIfNeededForUser(ps.name, userId);
		removeKeystoreDataIfNeeded(nextUserId, ps.appId);
		schedulePackageCleaning(ps.name, nextUserId, false);
		synchronized (mPackages) {
		@@ -19310,12 +19308,18 @@ public class PackageManagerService extends IPackageManager.Stub
		}
		}

		/** Clears state for all users, and touches intent filter verification policy */
		void clearDefaultBrowserIfNeeded(String packageName) {
		for (int oneUserId : sUserManager.getUserIds()) {
		String defaultBrowserPackageName = getDefaultBrowserPackageName(oneUserId);
		if (TextUtils.isEmpty(defaultBrowserPackageName)) continue;
		clearDefaultBrowserIfNeededForUser(packageName, oneUserId);
		}
		}

		private void clearDefaultBrowserIfNeededForUser(String packageName, int userId) {
		final String defaultBrowserPackageName = getDefaultBrowserPackageName(userId);
		if (!TextUtils.isEmpty(defaultBrowserPackageName)) {
		if (packageName.equals(defaultBrowserPackageName)) {
		setDefaultBrowserPackageName(null, oneUserId);
		setDefaultBrowserPackageName(null, userId);
		}
		}
		}

services/core/java/com/android/server/pm/Settings.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -1386,7 +1386,11 @@ final class Settings {
		if (userId == UserHandle.USER_ALL) {
		return false;
		}
		if (packageName != null) {
		mDefaultBrowserApp.put(userId, packageName);
		} else {
		mDefaultBrowserApp.remove(userId);
		}
		writePackageRestrictionsLPr(userId);
		return true;
		}