Merge "Add flag for filtering emergency calls from call log" (fd9f616e) · Commits · e / os / android_packages_apps_Dialer

java/com/android/dialer/app/calllog/CallLogAdapter.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -119,6 +119,8 @@ public class CallLogAdapter extends GroupingListAdapter
		public static final String ENABLE_CALL_LOG_MULTI_SELECT = "enable_call_log_multiselect";
		public static final boolean ENABLE_CALL_LOG_MULTI_SELECT_FLAG = true;

		@VisibleForTesting static final String FILTER_EMERGENCY_CALLS_FLAG = "filter_emergency_calls";

		protected final Activity activity;
		protected final VoicemailPlaybackPresenter voicemailPlaybackPresenter;
		/** Cache for repeated requests to Telecom/Telephony. */
		@@ -840,7 +842,7 @@ public class CallLogAdapter extends GroupingListAdapter
		}

		private boolean isHiddenRow(@Nullable String number, long rowId) {
		if (number != null && PhoneNumberUtils.isEmergencyNumber(number)) {
		if (isHideableEmergencyNumberRow(number)) {
		return true;
		}
		if (hiddenRowIds.contains(rowId)) {
		@@ -849,6 +851,13 @@ public class CallLogAdapter extends GroupingListAdapter
		return false;
		}

		private boolean isHideableEmergencyNumberRow(@Nullable String number) {
		if (!ConfigProviderBindings.get(activity).getBoolean(FILTER_EMERGENCY_CALLS_FLAG, false)) {
		return false;
		}
		return number != null && PhoneNumberUtils.isEmergencyNumber(number);
		}

		private void loadAndRender(
		final CallLogListItemViewHolder viewHolder,
		final long rowId,