diff options
author | Nick Kralevich <nnk@google.com> | 2014-03-14 19:32:15 -0700 |
---|---|---|
committer | Nick Kralevich <nnk@google.com> | 2014-03-14 19:32:15 -0700 |
commit | b9e36b4f5390c9100d567cbe6e61a3304e37e680 (patch) | |
tree | b183df935bd645c93e4b86069e1ee5bffb2c03aa /src/com | |
parent | f5d88b498c309782f9bf71650d972f8bbb784d98 (diff) | |
parent | 2ca55fd39b9b8a750e77ef4db4ee946fa03442ac (diff) | |
download | android_packages_providers_DownloadProvider-b9e36b4f5390c9100d567cbe6e61a3304e37e680.tar.gz android_packages_providers_DownloadProvider-b9e36b4f5390c9100d567cbe6e61a3304e37e680.tar.bz2 android_packages_providers_DownloadProvider-b9e36b4f5390c9100d567cbe6e61a3304e37e680.zip |
resolved conflicts for merge of 2ca55fd3 to master
Change-Id: I59df74b902c95299ae9adda2ddddb6bad4260159
Diffstat (limited to 'src/com')
-rw-r--r-- | src/com/android/providers/downloads/DownloadProvider.java | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java index cd55eee7..9130a50e 100644 --- a/src/com/android/providers/downloads/DownloadProvider.java +++ b/src/com/android/providers/downloads/DownloadProvider.java @@ -39,7 +39,6 @@ import android.os.Handler; import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor.OnCloseListener; import android.os.Process; -import android.os.SELinux; import android.provider.BaseColumns; import android.provider.Downloads; import android.provider.OpenableColumns; @@ -463,11 +462,6 @@ public final class DownloadProvider extends ContentProvider { // saves us by getting some initialization code in DownloadService out of the way. Context context = getContext(); context.startService(new Intent(context, DownloadService.class)); - try { - SELinux.restorecon(context.getCacheDir().getCanonicalPath()); - } catch (IOException e) { - Log.wtf(Constants.TAG, "Could not get canonical path for download directory", e); - } return true; } |