diff options
| author | Eugene Susla <eugenesusla@google.com> | 2019-02-01 18:26:05 +0000 |
|---|---|---|
| committer | Eugene Susla <eugenesusla@google.com> | 2019-02-01 18:26:30 +0000 |
| commit | c0826a6434d0268a3e75731d2d02b80172f9df10 (patch) | |
| tree | 4360a2f5c5b7d1854cb5e19f38b616018e46a7c8 /core/java/android/content/ContentProvider.java | |
| parent | e865b9d9bf8c739793aa645e3dca279e0bc22c0f (diff) | |
Revert "Log a warning if non-role holder attempts to read sms"
This reverts commit e865b9d9bf8c739793aa645e3dca279e0bc22c0f.
Reason for revert: caused b/123709320, also non needed any more
Fixes: 123709320
Change-Id: I2afa0a60133a490ab433cd04dd03a5e26fb3fc14
Diffstat (limited to 'core/java/android/content/ContentProvider.java')
| -rw-r--r-- | core/java/android/content/ContentProvider.java | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java index 13d12c984b78..f138d39b7fb0 100644 --- a/core/java/android/content/ContentProvider.java +++ b/core/java/android/content/ContentProvider.java @@ -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) { |