diff options
Diffstat (limited to 'core')
-rw-r--r-- | core/java/android/os/FileUtils.java | 2 | ||||
-rw-r--r-- | core/java/com/android/internal/os/ZygoteInit.java | 8 | ||||
-rw-r--r-- | core/jni/android_os_FileUtils.cpp | 6 |
3 files changed, 5 insertions, 11 deletions
diff --git a/core/java/android/os/FileUtils.java b/core/java/android/os/FileUtils.java index 7c103aa..0941d71 100644 --- a/core/java/android/os/FileUtils.java +++ b/core/java/android/os/FileUtils.java @@ -53,8 +53,6 @@ public class FileUtils { public static native int setPermissions(String file, int mode, int uid, int gid); - 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 mountPoint point for FAT volume diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java index 998c037..4924326 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java @@ -16,16 +16,17 @@ package com.android.internal.os; +import static libcore.io.OsConstants.S_IRWXG; +import static libcore.io.OsConstants.S_IRWXO; + import android.content.pm.ActivityInfo; import android.content.res.Resources; 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.Process; import android.os.SystemClock; -import android.os.SystemProperties; import android.util.EventLog; import android.util.Log; @@ -33,6 +34,7 @@ import dalvik.system.VMRuntime; import dalvik.system.Zygote; import libcore.io.IoUtils; +import libcore.io.Libcore; import java.io.BufferedReader; import java.io.FileDescriptor; @@ -447,7 +449,7 @@ 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); + Libcore.os.umask(S_IRWXG | S_IRWXO); if (parsedArgs.niceName != null) { Process.setArgV0(parsedArgs.niceName); diff --git a/core/jni/android_os_FileUtils.cpp b/core/jni/android_os_FileUtils.cpp index 82bfc36..a07f5b7 100644 --- a/core/jni/android_os_FileUtils.cpp +++ b/core/jni/android_os_FileUtils.cpp @@ -55,11 +55,6 @@ jint android_os_FileUtils_setPermissions(JNIEnv* env, jobject clazz, return chmod(file8.string(), mode) == 0 ? 0 : errno; } -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 (path == NULL) { @@ -83,7 +78,6 @@ jint android_os_FileUtils_getFatVolumeId(JNIEnv* env, jobject clazz, jstring pat static const JNINativeMethod methods[] = { {"setPermissions", "(Ljava/lang/String;III)I", (void*)android_os_FileUtils_setPermissions}, - {"setUMask", "(I)I", (void*)android_os_FileUtils_setUMask}, {"getFatVolumeId", "(Ljava/lang/String;)I", (void*)android_os_FileUtils_getFatVolumeId}, }; |