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

Commit dec3638c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clear identity to handle ALLOCATE_AGGRESSIVE." into oc-dev

parents 2359f016 9a4a4576

data/etc/privapp-permissions-platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ applications that come with the platform 


    <privapp-permissions package="com.android.defcontainer">

        <permission name="android.permission.ACCESS_CACHE_FILESYSTEM"/>

        <permission name="android.permission.ALLOCATE_AGGRESSIVE"/>

        <permission name="android.permission.INTERACT_ACROSS_USERS"/>

        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>

    </privapp-permissions>

packages/DefaultContainerService/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

        package="com.android.defcontainer" coreApp="true">

    <uses-permission android:name="android.permission.ALLOCATE_AGGRESSIVE"/>

    <uses-permission android:name="android.permission.ASEC_ACCESS"/>

    <uses-permission android:name="android.permission.ASEC_CREATE"/>

    <uses-permission android:name="android.permission.ASEC_DESTROY"/>

packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java

+11 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.content.pm.PackageParser.PackageLite; 
import android.content.pm.PackageParser.PackageParserException;

import android.content.res.ObbInfo;

import android.content.res.ObbScanner;

import android.os.Binder;

import android.os.Environment;

import android.os.Environment.UserEnvironment;

import android.os.FileUtils;
@@ -179,6 +180,15 @@ public class DefaultContainerService extends IntentService { 
                return ret;

            }



            final int recommendedInstallLocation;

            final long token = Binder.clearCallingIdentity();

            try {

                recommendedInstallLocation = PackageHelper.resolveInstallLocation(context,

                        pkg.packageName, pkg.installLocation, sizeBytes, flags);

            } finally {

                Binder.restoreCallingIdentity(token);

            }



            ret.packageName = pkg.packageName;

            ret.splitNames = pkg.splitNames;

            ret.versionCode = pkg.versionCode;
@@ -186,8 +196,7 @@ public class DefaultContainerService extends IntentService { 
            ret.splitRevisionCodes = pkg.splitRevisionCodes;

            ret.installLocation = pkg.installLocation;

            ret.verifiers = pkg.verifiers;

            ret.recommendedInstallLocation = PackageHelper.resolveInstallLocation(context,

                    pkg.packageName, pkg.installLocation, sizeBytes, flags);

            ret.recommendedInstallLocation = recommendedInstallLocation;

            ret.multiArch = pkg.multiArch;



            return ret;