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

Commit c2c3d18c authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Update shared sandbox prefix to "shared-"."

parents 24f78ddd d68bd60c

core/java/android/os/storage/StorageManager.java

+3 −0
Original line number Diff line number Diff line
@@ -268,6 +268,9 @@ public class StorageManager { 
    public static final int ENCRYPTION_STATE_ERROR_CORRUPT =

            IVold.ENCRYPTION_STATE_ERROR_CORRUPT;



    /** @hide Prefix used in sandboxIds for apps with sharedUserIds */

    public static final String SHARED_SANDBOX_PREFIX = "shared-";



    private static volatile IStorageManager sStorageManager = null;



    private final Context mContext;

core/tests/packagemanagertests/src/android/content/pm/KernelPackageMappingTests.java

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ public class KernelPackageMappingTests { 


    @Test

    public void testSharedInstalledPrimary() throws Exception {

        assertEquals("1001", getContent(getKernelPackageFile("shared:android.uid.phone", "appid")));

        assertEquals("1001", getContent(getKernelPackageFile("shared-android.uid.phone", "appid")));

    }



    @Test
@@ -92,7 +92,7 @@ public class KernelPackageMappingTests { 


    @Test

    public void testSharedInstalledAll() throws Exception {

        assertEquals("", getContent(getKernelPackageFile("shared:android.uid.phone",

        assertEquals("", getContent(getKernelPackageFile("shared-android.uid.phone",

                "excluded_userids")));

    }

services/core/java/com/android/server/StorageManagerService.java

+2 −3
Original line number Diff line number Diff line
@@ -186,8 +186,6 @@ class StorageManagerService extends IStorageManager.Stub 
    private static final boolean ENABLE_ISOLATED_STORAGE = SystemProperties

            .getBoolean(StorageManager.PROP_ISOLATED_STORAGE, false);



    private static final String SHARED_SANDBOX_ID_PREFIX = "shared:";



    public static class Lifecycle extends SystemService {

        private StorageManagerService mStorageManagerService;
@@ -1501,7 +1499,8 @@ class StorageManagerService extends IStorageManager.Stub 
    }



    private static String getSandboxId(String packageName, String sharedUserId) {

        return sharedUserId == null ? packageName : SHARED_SANDBOX_ID_PREFIX + sharedUserId;

        return sharedUserId == null

                ? packageName : StorageManager.SHARED_SANDBOX_PREFIX + sharedUserId;

    }



    private void connect() {

services/core/java/com/android/server/pm/Settings.java

+3 −2
Original line number Diff line number Diff line
@@ -2637,7 +2637,7 @@ public final class Settings { 
        }



        for (final SharedUserSetting sus : mSharedUsers.values()) {

            knownSet.remove(sus.getSandboxName());

            knownSet.remove(sus.getStorageSandboxName());

        }



        // Remove any unclaimed mappings
@@ -2653,7 +2653,8 @@ public final class Settings { 
    void writeKernelMappingLPr(SharedUserSetting sus) {

        if (mKernelMappingFilename == null || sus == null || sus.name == null) return;



        writeKernelMappingLPr(sus.getSandboxName(), sus.userId, sus.getNotInstalledUserIds());

        writeKernelMappingLPr(sus.getStorageSandboxName(),

                sus.userId, sus.getNotInstalledUserIds());

    }



    void writeKernelMappingLPr(PackageSetting ps) {

services/core/java/com/android/server/pm/SharedUserSetting.java

+3 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.pm; 
import android.annotation.Nullable;

import android.content.pm.ApplicationInfo;

import android.content.pm.PackageParser;

import android.os.storage.StorageManager;

import android.service.pm.PackageServiceDumpProto;

import android.util.ArraySet;

import android.util.proto.ProtoOutputStream;
@@ -166,8 +167,8 @@ public final class SharedUserSetting extends SettingBase { 
        return excludedUserIds == null ? EmptyArray.INT : excludedUserIds;

    }



    public String getSandboxName() {

        return "shared:" + name;

    public String getStorageSandboxName() {

        return StorageManager.SHARED_SANDBOX_PREFIX + name;

    }



    /** Updates all fields in this shared user setting from another. */