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

Commit c0c7f756 authored by Ivan Chiang's avatar Ivan Chiang Committed by Android (Google) Code Review
Browse files

Merge "Add @RequiresPermission annotations to getCahce and putCache"

parents bae1b921 a46ade3c

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -1305,8 +1305,8 @@ package android.content { 
  }















  public abstract class ContentResolver {













    method @Nullable public android.os.Bundle getCache(@NonNull android.net.Uri);













    method public void putCache(@NonNull android.net.Uri, @Nullable android.os.Bundle);













    method @Nullable @RequiresPermission("android.permission.CACHE_CONTENT") public android.os.Bundle getCache(@NonNull android.net.Uri);













    method @RequiresPermission("android.permission.CACHE_CONTENT") public void putCache(@NonNull android.net.Uri, @Nullable android.os.Bundle);















  }





























  public abstract class Context {

































core/java/android/content/ContentResolver.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -3159,6 +3159,7 @@ public abstract class ContentResolver implements ContentInterface {













     * @hide















     */















    @SystemApi













    @RequiresPermission(android.Manifest.permission.CACHE_CONTENT)















    public void putCache(@NonNull Uri key, @Nullable Bundle value) {















        try {















            getContentService().putCache(mContext.getPackageName(), key, value,









@@ -3178,6 +3179,7 @@ public abstract class ContentResolver implements ContentInterface {













     * @hide















     */















    @SystemApi













    @RequiresPermission(android.Manifest.permission.CACHE_CONTENT)















    public @Nullable Bundle getCache(@NonNull Uri key) {















        try {















            final Bundle bundle = getContentService().getCache(mContext.getPackageName(), key,

































services/core/java/com/android/server/content/ContentService.java



+3
−0




























Original line number
Diff line number
Diff line








@@ -19,6 +19,7 @@ package com.android.server.content;













import android.Manifest;















import android.accounts.Account;















import android.annotation.Nullable;













import android.annotation.RequiresPermission;















import android.app.ActivityManager;















import android.app.ActivityManagerInternal;















import android.app.AppOpsManager;










@@ -1174,6 +1175,7 @@ public final class ContentService extends IContentService.Stub {













    }































    @Override













    @RequiresPermission(android.Manifest.permission.CACHE_CONTENT)















    public void putCache(String packageName, Uri key, Bundle value, int userId) {















        Bundle.setDefusable(value, true);















        enforceCrossUserPermission(userId, TAG);









@@ -1196,6 +1198,7 @@ public final class ContentService extends IContentService.Stub {













    }































    @Override













    @RequiresPermission(android.Manifest.permission.CACHE_CONTENT)















    public Bundle getCache(String packageName, Uri key, int userId) {















        enforceCrossUserPermission(userId, TAG);















        mContext.enforceCallingOrSelfPermission(android.Manifest.permission.CACHE_CONTENT, TAG);