diff --git a/src/com/android/providers/telephony/SmsProvider.java b/src/com/android/providers/telephony/SmsProvider.java
index 0c59603..e2e6d10 100644
--- a/src/com/android/providers/telephony/SmsProvider.java
+++ b/src/com/android/providers/telephony/SmsProvider.java
@@ -16,9 +16,6 @@
 
 package com.android.providers.telephony;
 
-import static android.app.AppOpsManager.MODE_ALLOWED;
-import static android.app.AppOpsManager.MODE_IGNORED;
-
 import android.annotation.NonNull;
 import android.app.AppOpsManager;
 import android.content.ContentProvider;
@@ -36,7 +33,6 @@
 import android.os.Binder;
 import android.os.UserHandle;
 import android.provider.Contacts;
-import android.provider.Settings;
 import android.provider.Telephony;
 import android.provider.Telephony.MmsSms;
 import android.provider.Telephony.Sms;
@@ -846,19 +842,6 @@
         }
     }
 
-    /** @hide */
-    @Override
-    protected int interpretDefaultAppOpMode(int op) {
-        if (op == AppOpsManager.OP_WRITE_SMS) {
-            return MODE_IGNORED;
-        } else {
-            boolean accessRestrictionEnabled = Settings.Global.getInt(
-                    getContext().getContentResolver(),
-                    Settings.Global.SMS_ACCESS_RESTRICTION_ENABLED, 0) == 1;
-            return accessRestrictionEnabled ? MODE_IGNORED : MODE_ALLOWED;
-        }
-    }
-
     // Db open helper for tables stored in CE(Credential Encrypted) storage.
     @VisibleForTesting
     public SQLiteOpenHelper mCeOpenHelper;
