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

Commit b83f9c30 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge "Set umask of system server to 0077"

parents f9263dd0 90960e87

core/java/android/os/FileUtils.java

+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ public class FileUtils 


    public static native int getPermissions(String file, int[] outPermissions);



    public static native int setUMask(int mask);



    /** returns the FAT file system volume ID for the volume mounted 

     * at the given mount point, or -1 for failure

     * @param mount point for FAT volume

core/java/com/android/internal/os/ZygoteInit.java

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.res.TypedArray; 
import android.graphics.drawable.Drawable;

import android.net.LocalServerSocket;

import android.os.Debug;

import android.os.FileUtils;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.util.Config;
@@ -506,6 +507,9 @@ public class ZygoteInit { 


        closeServerSocket();



        // set umask to 0077 so new files and directories will default to owner-only permissions.

        FileUtils.setUMask(FileUtils.S_IRWXG | FileUtils.S_IRWXO);



        /*

         * Pass the remaining arguments to SystemServer.

         * "--nice-name=system_server com.android.server.SystemServer"

core/jni/android_os_FileUtils.cpp

+6 −0
Original line number Diff line number Diff line
@@ -113,6 +113,11 @@ jint android_os_FileUtils_getPermissions(JNIEnv* env, jobject clazz, 
    #endif

}



jint android_os_FileUtils_setUMask(JNIEnv* env, jobject clazz, jint mask)

{

    return umask(mask);

}



jint android_os_FileUtils_getFatVolumeId(JNIEnv* env, jobject clazz, jstring path)

{

    #if HAVE_ANDROID_OS
@@ -170,6 +175,7 @@ jboolean android_os_FileUtils_getFileStatus(JNIEnv* env, jobject clazz, jstring 
static const JNINativeMethod methods[] = {

    {"setPermissions",  "(Ljava/lang/String;III)I", (void*)android_os_FileUtils_setPermissions},

    {"getPermissions",  "(Ljava/lang/String;[I)I", (void*)android_os_FileUtils_getPermissions},

    {"setUMask",        "(I)I",                    (void*)android_os_FileUtils_setUMask},

    {"getFatVolumeId",  "(Ljava/lang/String;)I", (void*)android_os_FileUtils_getFatVolumeId},

    {"getFileStatus",  "(Ljava/lang/String;Landroid/os/FileUtils$FileStatus;)Z", (void*)android_os_FileUtils_getFileStatus},

};