Remove field prefixes.

Test: Existing tests
PiperOrigin-RevId: 180230450
Change-Id: I0b2589cfeeaef81e42a04efa48af24b4e4d0e95f

2 files changed, 42 insertions, 42 deletions

diff --git a/java/com/android/dialer/database/CallLogQueryHandler.java b/java/com/android/dialer/database/CallLogQueryHandler.java
index 35250d668..1aa125184 100644
--- a/java/com/android/dialer/database/CallLogQueryHandler.java
+++ b/java/com/android/dialer/database/CallLogQueryHandler.java
@@ -66,10 +66,10 @@ public class CallLogQueryHandler extends NoNullCursorAsyncQueryHandler {
   /** The token for the query to fetch the number of missed calls. */
   private static final int QUERY_MISSED_CALLS_UNREAD_COUNT_TOKEN = 59;
 
-  private final int mLogLimit;
-  private final WeakReference<Listener> mListener;
+  private final int logLimit;
+  private final WeakReference<Listener> listener;
 
-  private final Context mContext;
+  private final Context context;
 
   public CallLogQueryHandler(Context context, ContentResolver contentResolver, Listener listener) {
     this(context, contentResolver, listener, -1);
@@ -78,9 +78,9 @@ public class CallLogQueryHandler extends NoNullCursorAsyncQueryHandler {
   public CallLogQueryHandler(
       Context context, ContentResolver contentResolver, Listener listener, int limit) {
     super(contentResolver);
-    mContext = context.getApplicationContext();
-    mListener = new WeakReference<>(listener);
-    mLogLimit = limit;
+    this.context = context.getApplicationContext();
+    this.listener = new WeakReference<>(listener);
+    logLimit = limit;
   }
 
   @Override
@@ -97,7 +97,7 @@ public class CallLogQueryHandler extends NoNullCursorAsyncQueryHandler {
    */
   public void fetchCalls(int callType, long newerThan) {
     cancelFetch();
-    if (PermissionsUtil.hasPhonePermissions(mContext)) {
+    if (PermissionsUtil.hasPhonePermissions(context)) {
       fetchCalls(QUERY_CALLLOG_TOKEN, callType, false /* newOnly */, newerThan);
     } else {
       updateAdapterData(null);
@@ -108,11 +108,11 @@ public class CallLogQueryHandler extends NoNullCursorAsyncQueryHandler {
     StringBuilder where = new StringBuilder();
     List<String> selectionArgs = new ArrayList<>();
 
-    VoicemailComponent.get(mContext)
+    VoicemailComponent.get(context)
         .getVoicemailClient()
-        .appendOmtpVoicemailStatusSelectionClause(mContext, where, selectionArgs);
+        .appendOmtpVoicemailStatusSelectionClause(context, where, selectionArgs);
 
-    if (TelecomUtil.hasReadWriteVoicemailPermissions(mContext)) {
+    if (TelecomUtil.hasReadWriteVoicemailPermissions(context)) {
       startQuery(
           QUERY_VOICEMAIL_STATUS_TOKEN,
           null,
@@ -125,15 +125,15 @@ public class CallLogQueryHandler extends NoNullCursorAsyncQueryHandler {
   }
 
   public void fetchVoicemailUnreadCount() {
-    if (TelecomUtil.hasReadWriteVoicemailPermissions(mContext)) {
+    if (TelecomUtil.hasReadWriteVoicemailPermissions(context)) {
       // Only count voicemails that have not been read and have not been deleted.
       StringBuilder where =
           new StringBuilder(Voicemails.IS_READ + "=0" + " AND " + Voicemails.DELETED + "=0 ");
       List<String> selectionArgs = new ArrayList<>();
 
-      VoicemailComponent.get(mContext)
+      VoicemailComponent.get(context)
           .getVoicemailClient()
-          .appendOmtpVoicemailSelectionClause(mContext, where, selectionArgs);
+          .appendOmtpVoicemailSelectionClause(context, where, selectionArgs);
 
       startQuery(
           QUERY_VOICEMAIL_UNREAD_COUNT_TOKEN,
@@ -178,9 +178,9 @@ public class CallLogQueryHandler extends NoNullCursorAsyncQueryHandler {
     }
 
     if (callType == Calls.VOICEMAIL_TYPE) {
-      VoicemailComponent.get(mContext)
+      VoicemailComponent.get(context)
           .getVoicemailClient()
-          .appendOmtpVoicemailSelectionClause(mContext, where, selectionArgs);
+          .appendOmtpVoicemailSelectionClause(context, where, selectionArgs);
     } else {
       // Filter out all Duo entries other than video calls
       where
@@ -197,10 +197,10 @@ public class CallLogQueryHandler extends NoNullCursorAsyncQueryHandler {
           .append(")");
     }
 
-    final int limit = (mLogLimit == -1) ? NUM_LOGS_TO_DISPLAY : mLogLimit;
+    final int limit = (logLimit == -1) ? NUM_LOGS_TO_DISPLAY : logLimit;
     final String selection = where.length() > 0 ? where.toString() : null;
     Uri uri =
-        TelecomUtil.getCallLogUri(mContext)
+        TelecomUtil.getCallLogUri(context)
             .buildUpon()
             .appendQueryParameter(Calls.LIMIT_PARAM_KEY, Integer.toString(limit))
             .build();
@@ -221,7 +221,7 @@ public class CallLogQueryHandler extends NoNullCursorAsyncQueryHandler {
 
   /** Updates all missed calls to mark them as read. */
   public void markMissedCallsAsRead() {
-    if (!PermissionsUtil.hasPhonePermissions(mContext)) {
+    if (!PermissionsUtil.hasPhonePermissions(context)) {
       return;
     }
 
@@ -239,7 +239,7 @@ public class CallLogQueryHandler extends NoNullCursorAsyncQueryHandler {
 
   /** Fetch all missed calls received since last time the tab was opened. */
   public void fetchMissedCallsUnreadCount() {
-    if (!PermissionsUtil.hasPhonePermissions(mContext)) {
+    if (!PermissionsUtil.hasPhonePermissions(context)) {
       return;
     }
 
@@ -286,7 +286,7 @@ public class CallLogQueryHandler extends NoNullCursorAsyncQueryHandler {
    * listener took ownership of the cursor.
    */
   private boolean updateAdapterData(Cursor cursor) {
-    final Listener listener = mListener.get();
+    final Listener listener = this.listener.get();
     return listener != null && listener.onCallsFetched(cursor);
   }
 
@@ -303,21 +303,21 @@ public class CallLogQueryHandler extends NoNullCursorAsyncQueryHandler {
   }
 
   private void updateVoicemailStatus(Cursor statusCursor) {
-    final Listener listener = mListener.get();
+    final Listener listener = this.listener.get();
     if (listener != null) {
       listener.onVoicemailStatusFetched(statusCursor);
     }
   }
 
   private void updateVoicemailUnreadCount(Cursor statusCursor) {
-    final Listener listener = mListener.get();
+    final Listener listener = this.listener.get();
     if (listener != null) {
       listener.onVoicemailUnreadCountFetched(statusCursor);
     }
   }
 
   private void updateMissedCallsUnreadCount(Cursor statusCursor) {
-    final Listener listener = mListener.get();
+    final Listener listener = this.listener.get();
     if (listener != null) {
       listener.onMissedCallsUnreadCountFetched(statusCursor);
     }
diff --git a/java/com/android/dialer/database/DialerDatabaseHelper.java b/java/com/android/dialer/database/DialerDatabaseHelper.java
index 3fb87304b..d12b4e8bd 100644
--- a/java/com/android/dialer/database/DialerDatabaseHelper.java
+++ b/java/com/android/dialer/database/DialerDatabaseHelper.java
@@ -78,16 +78,16 @@ public class DialerDatabaseHelper extends SQLiteOpenHelper {
   private static final String DATABASE_VERSION_PROPERTY = "database_version";
   private static final int MAX_ENTRIES = 20;
 
-  private final Context mContext;
-  private boolean mIsTestInstance = false;
+  private final Context context;
+  private boolean isTestInstance = false;
 
   protected DialerDatabaseHelper(Context context, String databaseName, int dbVersion) {
     super(context, databaseName, null, dbVersion);
-    mContext = Objects.requireNonNull(context, "Context must not be null");
+    this.context = Objects.requireNonNull(context, "Context must not be null");
   }
 
   public void setIsTestInstance(boolean isTestInstance) {
-    mIsTestInstance = isTestInstance;
+    this.isTestInstance = isTestInstance;
   }
 
   /**
@@ -188,7 +188,7 @@ public class DialerDatabaseHelper extends SQLiteOpenHelper {
             + ");");
 
     setProperty(db, DATABASE_VERSION_PROPERTY, String.valueOf(DATABASE_VERSION));
-    if (!mIsTestInstance) {
+    if (!isTestInstance) {
       resetSmartDialLastUpdatedTime();
     }
   }
@@ -325,7 +325,7 @@ public class DialerDatabaseHelper extends SQLiteOpenHelper {
 
   private void resetSmartDialLastUpdatedTime() {
     final SharedPreferences databaseLastUpdateSharedPref =
-        mContext.getSharedPreferences(DATABASE_LAST_CREATED_SHARED_PREF, Context.MODE_PRIVATE);
+        context.getSharedPreferences(DATABASE_LAST_CREATED_SHARED_PREF, Context.MODE_PRIVATE);
     final SharedPreferences.Editor editor = databaseLastUpdateSharedPref.edit();
     editor.putLong(LAST_UPDATED_MILLIS, 0);
     editor.apply();
@@ -333,8 +333,8 @@ public class DialerDatabaseHelper extends SQLiteOpenHelper {
 
   /** Starts the database upgrade process in the background. */
   public void startSmartDialUpdateThread() {
-    if (PermissionsUtil.hasContactsReadPermissions(mContext)) {
-      DialerExecutorComponent.get(mContext)
+    if (PermissionsUtil.hasContactsReadPermissions(context)) {
+      DialerExecutorComponent.get(context)
           .dialerExecutorFactory()
           .createNonUiTaskBuilder(new UpdateSmartDialWorker())
           .build()
@@ -373,7 +373,7 @@ public class DialerDatabaseHelper extends SQLiteOpenHelper {
   }
 
   private Cursor getDeletedContactCursor(String lastUpdateMillis) {
-    return mContext
+    return context
         .getContentResolver()
         .query(
             DeleteContactQuery.URI,
@@ -517,7 +517,7 @@ public class DialerDatabaseHelper extends SQLiteOpenHelper {
 
         final String displayName = updatedContactCursor.getString(PhoneQuery.PHONE_DISPLAY_NAME);
         if (displayName == null) {
-          insert.bindString(5, mContext.getResources().getString(R.string.missing_name));
+          insert.bindString(5, context.getResources().getString(R.string.missing_name));
         } else {
           insert.bindString(5, displayName);
         }
@@ -535,7 +535,7 @@ public class DialerDatabaseHelper extends SQLiteOpenHelper {
         insert.executeInsert();
         final String contactPhoneNumber = updatedContactCursor.getString(PhoneQuery.PHONE_NUMBER);
         final ArrayList<String> numberPrefixes =
-            SmartDialPrefix.parseToNumberTokens(mContext, contactPhoneNumber);
+            SmartDialPrefix.parseToNumberTokens(context, contactPhoneNumber);
 
         for (String numberPrefix : numberPrefixes) {
           numberInsert.bindLong(1, updatedContactCursor.getLong(PhoneQuery.PHONE_CONTACT_ID));
@@ -578,7 +578,7 @@ public class DialerDatabaseHelper extends SQLiteOpenHelper {
       while (nameCursor.moveToNext()) {
         /** Computes a list of prefixes of a given contact name. */
         final ArrayList<String> namePrefixes =
-            SmartDialPrefix.generateNamePrefixes(mContext, nameCursor.getString(columnIndexName));
+            SmartDialPrefix.generateNamePrefixes(context, nameCursor.getString(columnIndexName));
 
         for (String namePrefix : namePrefixes) {
           insert.bindLong(1, nameCursor.getLong(columnIndexContactId));
@@ -611,7 +611,7 @@ public class DialerDatabaseHelper extends SQLiteOpenHelper {
 
     /** Gets the last update time on the database. */
     final SharedPreferences databaseLastUpdateSharedPref =
-        mContext.getSharedPreferences(DATABASE_LAST_CREATED_SHARED_PREF, Context.MODE_PRIVATE);
+        context.getSharedPreferences(DATABASE_LAST_CREATED_SHARED_PREF, Context.MODE_PRIVATE);
     final String lastUpdateMillis =
         String.valueOf(databaseLastUpdateSharedPref.getLong(LAST_UPDATED_MILLIS, 0));
 
@@ -644,7 +644,7 @@ public class DialerDatabaseHelper extends SQLiteOpenHelper {
        * up in updatedPhoneCursor (since all of its phone numbers have been deleted).
        */
       final Cursor updatedContactCursor =
-          mContext
+          context
               .getContentResolver()
               .query(
                   UpdatedContactQuery.URI,
@@ -673,7 +673,7 @@ public class DialerDatabaseHelper extends SQLiteOpenHelper {
      * update time.
      */
     final Cursor updatedPhoneCursor =
-        mContext
+        context
             .getContentResolver()
             .query(
                 PhoneQuery.URI,
@@ -804,8 +804,8 @@ public class DialerDatabaseHelper extends SQLiteOpenHelper {
 
     // Notify content observers that smart dial database has been updated.
     Intent intent = new Intent(ACTION_SMART_DIAL_UPDATED);
-    intent.setPackage(mContext.getPackageName());
-    mContext.sendBroadcast(intent);
+    intent.setPackage(context.getPackageName());
+    context.sendBroadcast(intent);
   }
 
   /**
@@ -912,9 +912,9 @@ public class DialerDatabaseHelper extends SQLiteOpenHelper {
         /**
          * If the contact has either the name or number that matches the query, add to the result.
          */
-        final boolean nameMatches = nameMatcher.matches(mContext, displayName);
+        final boolean nameMatches = nameMatcher.matches(context, displayName);
         final boolean numberMatches =
-            (nameMatcher.matchesNumber(mContext, phoneNumber, query) != null);
+            (nameMatcher.matchesNumber(context, phoneNumber, query) != null);
         if (nameMatches || numberMatches) {
           /** If a contact has not been added, add it to the result and the hash set. */
           duplicates.add(contactMatch);