Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge from open-source master

Browse Source 
Change-Id: Ia0dff818a574c8bc79aa79d65fd21bab9f9f6c30
This commit is contained in:
The Android Open Source Project
2010-07-09 15:59:17 -07:00
parent 990d9ca416 eb678fb63d
commit 0260887ca7
1 changed files with 39 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/app/ContextImpl.java
View File

@@ -53,7 +53,6 @@ import android.content.pm.PermissionInfo;
import android.content.pm.ProviderInfo; import android.content.pm.ProviderInfo;
import android.content.pm.ResolveInfo; import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo; import android.content.pm.ServiceInfo;
import android.content.pm.PackageParser.Package;
import android.content.res.AssetManager; import android.content.res.AssetManager;
import android.content.res.Resources; import android.content.res.Resources;
import android.content.res.XmlResourceParser; import android.content.res.XmlResourceParser;
@@ -85,11 +84,9 @@ import android.os.PowerManager;
import android.os.Process; import android.os.Process;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.StatFs;
import android.os.Vibrator; import android.os.Vibrator;
import android.os.FileUtils.FileStatus; import android.os.FileUtils.FileStatus;
import android.os.storage.StorageManager; import android.os.storage.StorageManager;
import android.provider.Settings;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.ClipboardManager; import android.text.ClipboardManager;
import android.util.AndroidRuntimeException; import android.util.AndroidRuntimeException;
@@ -437,7 +434,7 @@ class ContextImpl extends Context {
} }
if (!mFilesDir.exists()) { if (!mFilesDir.exists()) {
if(!mFilesDir.mkdirs()) { if(!mFilesDir.mkdirs()) {
Log.w(TAG, "Unable to create files directory"); Log.w(TAG, "Unable to create files directory " + mFilesDir.getPath());
return null; return null;
} }
FileUtils.setPermissions( FileUtils.setPermissions(