commit ff61812b6d0a4780c3dc048af6b3bd18bcbdba5f
author Svet Ganov <svetoslavganov@google.com> Mon Apr 08 00:07:10 2019 -0700
committer Svet Ganov <svetoslavganov@google.com> Mon Apr 08 00:22:33 2019 -0700
tree 03fada11122da4440a5e4b806cc3f00da72ffe95
parent 43175e996b055696ad487243806c424bebf8e23e

Restricted permission mechanism - TelephonyProvider

Test: atest CtsTelephonyTestCases

bug:124769181

Exempt-From-Owner-Approval: trivial change due to APi adjustment

Change-Id: I077340c367518f406caf653691a6b8ba3c273299

src/com/android/providers/telephony/SmsProvider.java

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;