Merge "Allow bugreport only after server-side config loaded" into tm-qpr-dev (95ffd81e) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/AnomalyReporter.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import android.content.Intent;
		import android.content.pm.PackageManager;
		import android.content.pm.ResolveInfo;
		import android.os.ParcelUuid;
		import android.provider.DeviceConfig;

		import com.android.internal.telephony.TelephonyStatsLog;
		import com.android.internal.util.IndentingPrintWriter;
		@@ -57,6 +58,9 @@ import java.util.concurrent.ConcurrentHashMap;
		public final class AnomalyReporter {
		private static final String TAG = "AnomalyReporter";

		private static final String KEY_IS_TELEPHONY_ANOMALY_REPORT_ENABLED =
		"is_telephony_anomaly_report_enabled";

		private static Context sContext = null;

		private static Map<UUID, Integer> sEvents = new ConcurrentHashMap<>();
		@@ -101,6 +105,12 @@ public final class AnomalyReporter {
		* @param carrierId the carrier of the id associated with this event.
		*/
		public static void reportAnomaly(@NonNull UUID eventId, String description, int carrierId) {
		// Don't report if the server-side flag isn't loaded, as it implies other anomaly report
		// related config hasn't loaded.
		boolean isAnomalyReportEnabledFromServer = DeviceConfig.getBoolean(
		DeviceConfig.NAMESPACE_TELEPHONY, KEY_IS_TELEPHONY_ANOMALY_REPORT_ENABLED, false);
		if (!isAnomalyReportEnabledFromServer) return;

		if (sContext == null) {
		Rlog.w(TAG, "AnomalyReporter not yet initialized, dropping event=" + eventId);
		return;