зеркало из https://github.com/mozilla/gecko-dev.git
Bug 886156 - Part 2: don't initialize PIC with null add-ons. r=nalexander
This commit is contained in:
Родитель
ccf78e8bcd
Коммит
c8f898fb4f
|
@ -77,7 +77,7 @@ public class ProfileInformationCache implements ProfileInformationProvider {
|
||||||
blocklistEnabled = object.getBoolean("blocklist");
|
blocklistEnabled = object.getBoolean("blocklist");
|
||||||
telemetryEnabled = object.getBoolean("telemetry");
|
telemetryEnabled = object.getBoolean("telemetry");
|
||||||
profileCreationTime = object.getLong("profileCreated");
|
profileCreationTime = object.getLong("profileCreated");
|
||||||
addons = object.optJSONObject("addons");
|
addons = object.getJSONObject("addons");
|
||||||
return true;
|
return true;
|
||||||
default:
|
default:
|
||||||
Logger.warn(LOG_TAG, "Unable to restore from version " + version + " PIC file: expecting " + FORMAT_VERSION);
|
Logger.warn(LOG_TAG, "Unable to restore from version " + version + " PIC file: expecting " + FORMAT_VERSION);
|
||||||
|
@ -161,6 +161,7 @@ public class ProfileInformationCache implements ProfileInformationProvider {
|
||||||
} catch (FileNotFoundException e) {
|
} catch (FileNotFoundException e) {
|
||||||
return false;
|
return false;
|
||||||
} catch (JSONException e) {
|
} catch (JSONException e) {
|
||||||
|
Logger.warn(LOG_TAG, "Malformed ProfileInformationCache. Not restoring.");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче