Bug 1256236 - Remove unused Distribution.getDescriptor(). r=sebastian

MozReview-Commit-ID: C2I1AJB1xp6

--HG--
extra : amend_source : e8f92237a485151778021a1fc69219de738303ab
This commit is contained in:
Umesh_Kumhar 2016-03-15 04:24:57 +05:30
Родитель eda30a3b1e
Коммит e30233beae
1 изменённых файлов: 0 добавлений и 28 удалений

Просмотреть файл

@ -350,34 +350,6 @@ public class Distribution {
return descFile;
}
public DistributionDescriptor getDescriptor() {
File descFile = getDistributionFile("preferences.json");
if (descFile == null) {
// Logging and existence checks are handled in getDistributionFile.
return null;
}
try {
JSONObject all = new JSONObject(FileUtils.getFileContents(descFile));
if (!all.has("Global")) {
Log.e(LOGTAG, "Distribution preferences.json has no Global entry!");
return null;
}
return new DistributionDescriptor(all.getJSONObject("Global"));
} catch (IOException e) {
Log.e(LOGTAG, "Error getting distribution descriptor file.", e);
Telemetry.addToHistogram(HISTOGRAM_CODE_CATEGORY, CODE_CATEGORY_MALFORMED_DISTRIBUTION);
return null;
} catch (JSONException e) {
Log.e(LOGTAG, "Error parsing preferences.json", e);
Telemetry.addToHistogram(HISTOGRAM_CODE_CATEGORY, CODE_CATEGORY_MALFORMED_DISTRIBUTION);
return null;
}
}
/**
* Get the Android preferences from the preferences.json file, if any exist.
* @return The preferences in a JSONObject, or an empty JSONObject if no preferences are defined.