From f31b19892840f0d139148040d980c410a9937ed2 Mon Sep 17 00:00:00 2001
From: Michael W <baddaemon87@gmail.com>
Date: Mon, 16 Dec 2024 18:19:29 +0100
Subject: [PATCH] Messaging: Remove usages of DataUsageStatUpdater

Since Q, contacts affinity isn't supported anymore, as reflected by
the documentation plus DataUsageStatUpdater code itself

Change-Id: I35e00d0fa743525c3b977c9756126ae764726afa
---
 Android.bp                                    |  1 -
 .../datamodel/data/ConversationData.java      | 21 -------------------
 2 files changed, 22 deletions(-)

diff --git a/Android.bp b/Android.bp
index 3225144..0ccd210 100644
--- a/Android.bp
+++ b/Android.bp
@@ -76,7 +76,6 @@ android_app {
         "libchips",
         "libphotoviewer",
         "androidx.annotation_annotation",
-        "android-common",
         "android-common-framesequence",
         "com.android.vcard",
         "guava",
diff --git a/src/com/android/messaging/datamodel/data/ConversationData.java b/src/com/android/messaging/datamodel/data/ConversationData.java
index 9545ed3..5d5161f 100644
--- a/src/com/android/messaging/datamodel/data/ConversationData.java
+++ b/src/com/android/messaging/datamodel/data/ConversationData.java
@@ -20,7 +20,6 @@ package com.android.messaging.datamodel.data;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.CursorWrapper;
-import android.database.sqlite.SQLiteFullException;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -30,7 +29,6 @@ import androidx.annotation.Nullable;
 import androidx.loader.app.LoaderManager;
 import androidx.loader.content.Loader;
 
-import com.android.common.contacts.DataUsageStatUpdater;
 import com.android.messaging.Factory;
 import com.android.messaging.R;
 import com.android.messaging.datamodel.BoundCursorLoader;
@@ -52,10 +50,8 @@ import com.android.messaging.sms.MmsSmsUtils;
 import com.android.messaging.sms.MmsUtils;
 import com.android.messaging.util.Assert;
 import com.android.messaging.util.Assert.RunsOnMainThread;
-import com.android.messaging.util.ContactUtil;
 import com.android.messaging.util.LogUtil;
 import com.android.messaging.util.PhoneUtils;
-import com.android.messaging.util.SafeAsyncTask;
 import com.android.messaging.widget.WidgetConversationProvider;
 
 import java.util.ArrayList;
@@ -631,23 +627,6 @@ public class ConversationData extends BindableData {
                 }
             }
         }
-
-        if (ContactUtil.hasReadContactsPermission()) {
-            SafeAsyncTask.executeOnThreadPool(() -> {
-                final DataUsageStatUpdater updater = new DataUsageStatUpdater(
-                        Factory.get().getApplicationContext());
-                try {
-                    if (!phones.isEmpty()) {
-                        updater.updateWithPhoneNumber(phones);
-                    }
-                    if (!emails.isEmpty()) {
-                        updater.updateWithAddress(emails);
-                    }
-                } catch (final SQLiteFullException ex) {
-                    LogUtil.w(TAG, "Unable to update contact", ex);
-                }
-            });
-        }
     }
 
     public void downloadMessage(final BindingBase<ConversationData> binding,