Merge "Set browser role holder when restoring default browser."

This commit is contained in:
TreeHugger Robot
2019-02-14 18:52:58 +00:00
committed by Android (Google) Code Review

View File

@@ -19569,8 +19569,17 @@ public class PackageManagerService extends IPackageManager.Stub
parser.setInput(new ByteArrayInputStream(backup), StandardCharsets.UTF_8.name());
restoreFromXml(parser, userId, TAG_DEFAULT_APPS,
(parser1, userId1) -> {
String defaultBrowser;
synchronized (mPackages) {
mSettings.readDefaultAppsLPw(parser1, userId1);
defaultBrowser = mSettings.removeDefaultBrowserPackageNameLPw(userId1);
}
if (defaultBrowser != null) {
PackageManagerInternal.DefaultBrowserProvider provider;
synchronized (mPackages) {
provider = mDefaultBrowserProvider;
}
provider.setDefaultBrowser(defaultBrowser, userId1);
}
});
} catch (Exception e) {