commit e75909d7f96ab75c64be108f48a9bcc0934ae070
author Bijan Amirzada <bijana@codeaurora.org> Tue May 06 14:18:54 2014 -0700
committer WebTech Code Review <code-review@localhost> Wed May 14 14:06:55 2014 -0700
tree 37e80713db92de7b004ab832fe7dd343c33cba4e
parent cc4bc5e7d0725fc7812da90bf48d6621aedc595a

Changes to conform to new overlay format

- Added new overlay resources and checks for new resource values
- Removed all references to carrier specific lookups and
converted them to overlay implementations instead.
- Removed old resources from assets directory

Change-Id: I5143b499ffb6f1e08d1f9c846eec94300de87561

src/com/android/browser/UploadHandler.java

diff --git a/src/com/android/browser/UploadHandler.java b/src/com/android/browser/UploadHandler.java
index 51ca7f9..e3eda33 100644
--- a/src/com/android/browser/UploadHandler.java
+++ b/src/com/android/browser/UploadHandler.java
@@ -119,10 +119,10 @@
         }
 
         // Add for carrier feature - prevent uploading DRM type files.
-        String browserRes = mController.getActivity().getResources().
-                getString(R.string.config_carrier_resource);
+        boolean drmUploadEnabled = mController.getContext().getResources().getBoolean(
+                                       R.bool.drm_uploads);
         boolean isDRMFileType = false;
-        if ("ct".equals(browserRes) && filePath != null
+        if (drmUploadEnabled && filePath != null
                 && (filePath.endsWith(".fl") || filePath.endsWith(".dm")
                 || filePath.endsWith(".dcf") || filePath.endsWith(".dr")
                 || filePath.endsWith(".dd"))) {