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

Commit b8543da9 authored by Eugene Susla's avatar Eugene Susla Committed by Android (Google) Code Review
Browse files

Merge "Revert "Log a warning if non-role holder attempts to read sms""

parents fccfd272 c0826a64

core/java/android/content/ContentProvider.java

+0 −12
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.UnsupportedAppUsage;

import android.app.AppOpsManager;

import android.app.role.RoleManager;

import android.content.pm.PathPermission;

import android.content.pm.ProviderInfo;

import android.content.res.AssetFileDescriptor;
@@ -226,17 +225,6 @@ public abstract class ContentProvider implements ContentInterface, ComponentCall 
        @Override

        public Cursor query(String callingPkg, Uri uri, @Nullable String[] projection,

                @Nullable Bundle queryArgs, @Nullable ICancellationSignal cancellationSignal) {

            if (uri.toString().startsWith("content://sms")) {

                RoleManager rm = getContext().getSystemService(RoleManager.class);

                if (!rm.isRoleHeld(RoleManager.ROLE_SMS)

                        && !rm.isRoleHeld(RoleManager.ROLE_DIALER)

                        && !rm.isRoleHeld(RoleManager.ROLE_ASSISTANT)) {

                    // STOPSHIP: log it to westworld instead

                    Log.wtf(TAG, "Sms access attempted by " + callingPkg

                            + " despite not holding an appropriate role");

                }

            }



            uri = validateIncomingUri(uri);

            uri = maybeGetUriWithoutUserId(uri);

            if (enforceReadPermission(callingPkg, uri, null) != AppOpsManager.MODE_ALLOWED) {