Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b3147aa authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Ifedddd2b,Iaeeae900,I1f8348fb,Iff042966

* changes:
  Check for WRITE_CALL_LOG permission in CallLogNotificationsQueryHelper.
  Ignore dialer OMTP VVM error if VVM is disabled
  Bump version codes and name to v22
  Adds alternative spam words for non-english speaking countries.
parents 992ade71 0a41f3c3
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
  coreApp="true"
  package="com.android.dialer"
  android:versionCode="2700000"
  android:versionName="21.0">
  android:versionCode="2800000"
  android:versionName="22.0">

  <uses-sdk
    android:minSdkVersion="24"
+8 −1
Original line number Diff line number Diff line
@@ -111,7 +111,14 @@ public class CallLogNotificationsQueryHelper {
      return;
    }
    if (!PermissionsUtil.hasPhonePermissions(context)) {
      LogUtil.e("CallLogNotificationsQueryHelper.markMissedCallsInCallLogAsRead", "no permission");
      LogUtil.e(
          "CallLogNotificationsQueryHelper.markMissedCallsInCallLogAsRead", "no phone permission");
      return;
    }
    if (!PermissionsUtil.hasCallLogWritePermissions(context)) {
      LogUtil.e(
          "CallLogNotificationsQueryHelper.markMissedCallsInCallLogAsRead",
          "no call log write permission");
      return;
    }

+2 −2
Original line number Diff line number Diff line
@@ -182,10 +182,10 @@ public class VisualVoicemailCallLogFragment extends CallLogFragment {
  }

  @VisibleForTesting
  static boolean shouldAutoSync(
  boolean shouldAutoSync(
      VoicemailErrorMessageCreator errorMessageCreator, List<VoicemailStatus> statuses) {
    for (VoicemailStatus status : statuses) {
      if (!status.isActive()) {
      if (!status.isActive(getContext())) {
        continue;
      }
      if (errorMessageCreator.isSyncBlockingError(status)) {
+3 −1
Original line number Diff line number Diff line
@@ -86,9 +86,11 @@ public class VoicemailErrorManager implements CallLogQueryHandler.Listener, Voic
    List<VoicemailStatus> statuses = new ArrayList<>();
    while (statusCursor.moveToNext()) {
      VoicemailStatus status = new VoicemailStatus(context, statusCursor);
      if (status.isActive()) {
      if (status.isActive(context)) {
        statuses.add(status);
        addServiceStateListener(status);
      } else {
        LogUtil.i("VisualVoicemailCallLogFragment.shouldAutoSync", "inactive source ignored");
      }
    }
    alertItem.updateStatus(statuses, this);
+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
  coreApp="true"
  package="com.google.android.google_stub_dialer"
  android:versionCode="2700000"
  android:versionName="21.0">
  android:versionCode="2800000"
  android:versionName="22.0">

  <uses-sdk
    android:minSdkVersion="24"
Loading