diff options
author | Geremy Condra <gcondra@google.com> | 2013-04-05 22:41:03 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-05 22:41:04 +0000 |
commit | 62608885d3d8a7b88776084040f666bd1304b811 (patch) | |
tree | f12b7b394faccf66683d8d1d7ff3198a2a79607c | |
parent | af49093b1554fdc55977e9281505e05865f33813 (diff) | |
parent | 498f62e2da65df9e11e8da6feb959ed0d513f792 (diff) | |
download | android_packages_providers_DownloadProvider-62608885d3d8a7b88776084040f666bd1304b811.tar.gz android_packages_providers_DownloadProvider-62608885d3d8a7b88776084040f666bd1304b811.tar.bz2 android_packages_providers_DownloadProvider-62608885d3d8a7b88776084040f666bd1304b811.zip |
Merge "Restore the appropriate SELinux context to the downloads dir." into jb-mr2-dev
-rw-r--r-- | src/com/android/providers/downloads/DownloadProvider.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java index 2d0c807a..e0b5842d 100644 --- a/src/com/android/providers/downloads/DownloadProvider.java +++ b/src/com/android/providers/downloads/DownloadProvider.java @@ -37,6 +37,7 @@ import android.os.Binder; import android.os.Environment; import android.os.ParcelFileDescriptor; import android.os.Process; +import android.os.SELinux; import android.provider.BaseColumns; import android.provider.Downloads; import android.provider.OpenableColumns; @@ -441,8 +442,7 @@ public final class DownloadProvider extends ContentProvider { appInfo = getContext().getPackageManager(). getApplicationInfo("com.android.defcontainer", 0); } catch (NameNotFoundException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + Log.wtf(Constants.TAG, "Could not get ApplicationInfo for com.android.defconatiner", e); } if (appInfo != null) { mDefContainerUid = appInfo.uid; @@ -452,6 +452,11 @@ public final class DownloadProvider extends ContentProvider { Context context = getContext(); context.startService(new Intent(context, DownloadService.class)); mDownloadsDataDir = StorageManager.getDownloadDataDirectory(getContext()); + try { + SELinux.restorecon(mDownloadsDataDir.getCanonicalPath()); + } catch (IOException e) { + Log.wtf(Constants.TAG, "Could not get canonical path for download directory", e); + } return true; } |