resolved conflicts for merge of 2ca55fd3 to master
Nick Kralevich [Sat, 15 Mar 2014 02:32:15 +0000 (19:32 -0700)]
Change-Id: I59df74b902c95299ae9adda2ddddb6bad4260159

1  2 
src/com/android/providers/downloads/DownloadProvider.java

@@@ -463,11 -463,7 +462,6 @@@ public final class DownloadProvider ext
          // 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);
-         }
 -        mDownloadsDataDir = StorageManager.getDownloadDataDirectory(getContext());
          return true;
      }