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

Commit 523643c4 authored by Sudheer Shanka's avatar Sudheer Shanka
Browse files

Allow certain apps to access blobs across users. 

BlobStoreManagerService is updated to store only
one copy of any blob on device and to allow apps
with new ACCESS_BLOBS_ACROSS_USERS priv permission
to access blobs commited by their instances on other
users.

Bug: 175844032
Test: atest --test-mapping apex/blobstore
Change-Id: If6d10d90b17bde33baf9e83eeaae75d09d0b50ae
parent 086a0be6

apex/blobstore/framework/java/android/app/blob/BlobHandle.java

+1 −1
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ import android.annotation.NonNull; 
import android.os.Parcel;

import android.os.Parcelable;

import android.util.Base64;

import android.util.IndentingPrintWriter;



import com.android.internal.util.IndentingPrintWriter;

import com.android.internal.util.Preconditions;

import com.android.internal.util.XmlUtils;

apex/blobstore/service/java/com/android/server/blob/BlobAccessMode.java

+1 −1
Original line number Diff line number Diff line
@@ -37,9 +37,9 @@ import android.permission.PermissionManager; 
import android.util.ArraySet;

import android.util.Base64;

import android.util.DebugUtils;

import android.util.IndentingPrintWriter;

import android.util.Slog;



import com.android.internal.util.IndentingPrintWriter;

import com.android.internal.util.XmlUtils;



import org.xmlpull.v1.XmlPullParser;

apex/blobstore/service/java/com/android/server/blob/BlobMetadata.java

+180 −64

File changed.

Preview size limit exceeded, changes collapsed.

apex/blobstore/service/java/com/android/server/blob/BlobStoreConfig.java

+3 −3
Original line number Diff line number Diff line
@@ -27,12 +27,11 @@ import android.provider.DeviceConfig; 
import android.provider.DeviceConfig.Properties;

import android.text.TextUtils;

import android.util.DataUnit;

import android.util.IndentingPrintWriter;

import android.util.Log;

import android.util.Slog;

import android.util.TimeUtils;



import com.android.internal.util.IndentingPrintWriter;



import java.io.File;

import java.util.concurrent.TimeUnit;
@@ -47,8 +46,9 @@ class BlobStoreConfig { 
    public static final int XML_VERSION_ADD_DESC_RES_NAME = 3;

    public static final int XML_VERSION_ADD_COMMIT_TIME = 4;

    public static final int XML_VERSION_ADD_SESSION_CREATION_TIME = 5;

    public static final int XML_VERSION_ALLOW_ACCESS_ACROSS_USERS = 6;



    public static final int XML_VERSION_CURRENT = XML_VERSION_ADD_SESSION_CREATION_TIME;

    public static final int XML_VERSION_CURRENT = XML_VERSION_ALLOW_ACCESS_ACROSS_USERS;



    public static final long INVALID_BLOB_ID = 0;

    public static final long INVALID_BLOB_SIZE = 0;

apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java

+164 −179

File changed.

Preview size limit exceeded, changes collapsed.