remove usage of hidden public constants.

Change-Id: I2edf1bef5e741de8193cb293807e3ace42003b0c

6 files changed, 9 insertions, 11 deletions

diff --git a/src/com/android/providers/downloads/Constants.java b/src/com/android/providers/downloads/Constants.java
index 5cf13531..fe03bf74 100644
--- a/src/com/android/providers/downloads/Constants.java
+++ b/src/com/android/providers/downloads/Constants.java
@@ -16,7 +16,6 @@
 
 package com.android.providers.downloads;
 
-import android.util.Config;
 import android.util.Log;
 
 /**
@@ -145,8 +144,7 @@ public class Constants {
 
     /** Enable verbose logging - use with "setprop log.tag.DownloadManager VERBOSE" */
     private static final boolean LOCAL_LOGV = false;
-    public static final boolean LOGV = Config.LOGV
-            || (Config.LOGD && LOCAL_LOGV && Log.isLoggable(TAG, Log.VERBOSE));
+    public static final boolean LOGV = LOCAL_LOGV && Log.isLoggable(TAG, Log.VERBOSE);
 
     /** Enable super-verbose logging */
     private static final boolean LOCAL_LOGVV = false;
diff --git a/src/com/android/providers/downloads/DownloadNotification.java b/src/com/android/providers/downloads/DownloadNotification.java
index 4d615df7..4002a97a 100644
--- a/src/com/android/providers/downloads/DownloadNotification.java
+++ b/src/com/android/providers/downloads/DownloadNotification.java
@@ -259,12 +259,12 @@ class DownloadNotification {
 
     private boolean isActiveAndVisible(DownloadInfo download) {
         return 100 <= download.mStatus && download.mStatus < 200
-                && download.mVisibility != Downloads.VISIBILITY_HIDDEN;
+                && download.mVisibility != Downloads.Impl.VISIBILITY_HIDDEN;
     }
 
     private boolean isCompleteAndVisible(DownloadInfo download) {
         return download.mStatus >= 200
-                && download.mVisibility == Downloads.VISIBILITY_VISIBLE_NOTIFY_COMPLETED;
+                && download.mVisibility == Downloads.Impl.VISIBILITY_VISIBLE_NOTIFY_COMPLETED;
     }
 
     /*
diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java
index 9998c3b2..f6f1b940 100644
--- a/src/com/android/providers/downloads/DownloadProvider.java
+++ b/src/com/android/providers/downloads/DownloadProvider.java
@@ -25,10 +25,7 @@ import android.content.UriMatcher;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
-import android.database.CrossProcessCursor;
 import android.database.Cursor;
-import android.database.CursorWindow;
-import android.database.CursorWrapper;
 import android.database.SQLException;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
@@ -49,7 +46,6 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 
 /**
diff --git a/src/com/android/providers/downloads/DownloadReceiver.java b/src/com/android/providers/downloads/DownloadReceiver.java
index c41895b9..2cb6aba4 100644
--- a/src/com/android/providers/downloads/DownloadReceiver.java
+++ b/src/com/android/providers/downloads/DownloadReceiver.java
@@ -41,6 +41,7 @@ public class DownloadReceiver extends BroadcastReceiver {
     @VisibleForTesting
     SystemFacade mSystemFacade = null;
 
+    @Override
     public void onReceive(Context context, Intent intent) {
         if (mSystemFacade == null) {
             mSystemFacade = new RealSystemFacade(context);
diff --git a/src/com/android/providers/downloads/DownloadService.java b/src/com/android/providers/downloads/DownloadService.java
index 169ef970..2596fae3 100644
--- a/src/com/android/providers/downloads/DownloadService.java
+++ b/src/com/android/providers/downloads/DownloadService.java
@@ -44,7 +44,6 @@ import com.google.android.collect.Maps;
 import com.google.common.annotations.VisibleForTesting;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
@@ -114,6 +113,7 @@ public class DownloadService extends Service {
          * Receives notification when the data in the observed content
          * provider changes.
          */
+        @Override
         public void onChange(final boolean selfChange) {
             if (Constants.LOGVV) {
                 Log.v(Constants.TAG, "Service ContentObserver received notification");
@@ -188,6 +188,7 @@ public class DownloadService extends Service {
      *
      * @throws UnsupportedOperationException
      */
+    @Override
     public IBinder onBind(Intent i) {
         throw new UnsupportedOperationException("Cannot bind to Download Manager Service");
     }
@@ -195,6 +196,7 @@ public class DownloadService extends Service {
     /**
      * Initializes the service when it is first created
      */
+    @Override
     public void onCreate() {
         super.onCreate();
         if (Constants.LOGVV) {
@@ -232,6 +234,7 @@ public class DownloadService extends Service {
     /**
      * Cleans up when the service is destroyed
      */
+    @Override
     public void onDestroy() {
         getContentResolver().unregisterContentObserver(mObserver);
         if (Constants.LOGVV) {
@@ -258,6 +261,7 @@ public class DownloadService extends Service {
             super("Download Service");
         }
 
+        @Override
         public void run() {
             Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
 
diff --git a/src/com/android/providers/downloads/DownloadThread.java b/src/com/android/providers/downloads/DownloadThread.java
index 95e9e961..f6f511e9 100644
--- a/src/com/android/providers/downloads/DownloadThread.java
+++ b/src/com/android/providers/downloads/DownloadThread.java
@@ -24,7 +24,6 @@ import android.content.Intent;
 import android.drm.mobile1.DrmRawContent;
 import android.net.http.AndroidHttpClient;
 import android.net.Proxy;
-import android.net.Uri;
 import android.os.FileUtils;
 import android.os.PowerManager;
 import android.os.Process;