From 0a77c62a82503b38c484e0079648f0231dd85d53 Mon Sep 17 00:00:00 2001
From: Steve Howard <showard@google.com>
Date: Wed, 21 Jul 2010 11:41:30 -0700
Subject: Public API support for broadcasts and connectivity control.

* Three new DB fields, one indicating whether a download was initiated by the public API or not, two to hold connectivity control info.  DB migration to add these fields and code in DownloadProvider.insert() to handle them.
* Change broadcast intent code to match public API spec, for public API downloads only.  (Legacy code can go away once existing clients are converted over to the new API.)
* Introduce SystemFacade methods for sending broadcasts and checking package ownership; this facilitates new tests of broadcast code.
* Change DownloadInfo.canUseNetwork() to obey new connectivity controls available in public API, but again, retain legacy behavior for downloads initiated directly through DownloadProvider
* New test cases to cover the new behavior

Also made a couple changes to reduce some test flakiness I was observing:
* in tearDown(), wait for any running UpdateThread to complete
* in PublicApiFunctionalTest.setUp(), if the test directory already exists, remove it rather than aborting

DB changes for broadcast + roaming support

Change-Id: I60f39fc133f678f3510880ea6eb9f639358914b4
---
 .../providers/downloads/DownloadProvider.java      | 44 +++++++++++++++++++---
 1 file changed, 38 insertions(+), 6 deletions(-)

(limited to 'src/com/android/providers/downloads/DownloadProvider.java')

diff --git a/src/com/android/providers/downloads/DownloadProvider.java b/src/com/android/providers/downloads/DownloadProvider.java
index c210063a..bb205ad4 100644
--- a/src/com/android/providers/downloads/DownloadProvider.java
+++ b/src/com/android/providers/downloads/DownloadProvider.java
@@ -56,7 +56,7 @@ public final class DownloadProvider extends ContentProvider {
     /** Database filename */
     private static final String DB_NAME = "downloads.db";
     /** Current database version */
-    private static final int DB_VERSION = 101;
+    private static final int DB_VERSION = 102;
     /** Name of table in the database */
     private static final String DB_TABLE = "downloads";
 
@@ -95,7 +95,7 @@ public final class DownloadProvider extends ContentProvider {
         Downloads.Impl.COLUMN_TOTAL_BYTES,
         Downloads.Impl.COLUMN_CURRENT_BYTES,
         Downloads.Impl.COLUMN_TITLE,
-        Downloads.Impl.COLUMN_DESCRIPTION
+        Downloads.Impl.COLUMN_DESCRIPTION,
     };
 
     private static HashSet<String> sAppReadableColumnsSet;
@@ -182,11 +182,32 @@ public final class DownloadProvider extends ContentProvider {
                     createHeadersTable(db);
                     break;
 
+                case 102:
+                    addColumn(db, DB_TABLE, Downloads.Impl.COLUMN_IS_PUBLIC_API,
+                              "INTEGER NOT NULL DEFAULT 0");
+                    addColumn(db, DB_TABLE, Downloads.Impl.COLUMN_ALLOW_ROAMING,
+                              "INTEGER NOT NULL DEFAULT 0");
+                    addColumn(db, DB_TABLE, Downloads.Impl.COLUMN_ALLOWED_NETWORK_TYPES,
+                              "INTEGER NOT NULL DEFAULT 0");
+                    break;
+
                 default:
                     throw new IllegalStateException("Don't know how to upgrade to " + version);
             }
         }
 
+        /**
+         * Add a column to a table using ALTER TABLE.
+         * @param dbTable name of the table
+         * @param columnName name of the column to add
+         * @param columnDefinition SQL for the column definition
+         */
+        private void addColumn(SQLiteDatabase db, String dbTable, String columnName,
+                               String columnDefinition) {
+            db.execSQL("ALTER TABLE " + dbTable + " ADD COLUMN " + columnName + " "
+                       + columnDefinition);
+        }
+
         /**
          * Creates the table that'll hold the download information.
          */
@@ -346,15 +367,21 @@ public final class DownloadProvider extends ContentProvider {
         filteredValues.put(Downloads.Impl.COLUMN_STATUS, Downloads.Impl.STATUS_PENDING);
         filteredValues.put(Downloads.Impl.COLUMN_LAST_MODIFICATION,
                            mSystemFacade.currentTimeMillis());
+
+        copyBoolean(Downloads.Impl.COLUMN_IS_PUBLIC_API, values, filteredValues);
+        boolean isPublicApi =
+                values.getAsBoolean(Downloads.Impl.COLUMN_IS_PUBLIC_API) == Boolean.TRUE;
+
         String pckg = values.getAsString(Downloads.Impl.COLUMN_NOTIFICATION_PACKAGE);
         String clazz = values.getAsString(Downloads.Impl.COLUMN_NOTIFICATION_CLASS);
-        if (pckg != null && clazz != null) {
+        if (pckg != null && (clazz != null || isPublicApi)) {
             int uid = Binder.getCallingUid();
             try {
-                if (uid == 0 ||
-                        getContext().getPackageManager().getApplicationInfo(pckg, 0).uid == uid) {
+                if (uid == 0 || mSystemFacade.userOwnsPackage(uid, pckg)) {
                     filteredValues.put(Downloads.Impl.COLUMN_NOTIFICATION_PACKAGE, pckg);
-                    filteredValues.put(Downloads.Impl.COLUMN_NOTIFICATION_CLASS, clazz);
+                    if (clazz != null) {
+                        filteredValues.put(Downloads.Impl.COLUMN_NOTIFICATION_CLASS, clazz);
+                    }
                 }
             } catch (PackageManager.NameNotFoundException ex) {
                 /* ignored for now */
@@ -376,6 +403,11 @@ public final class DownloadProvider extends ContentProvider {
         copyString(Downloads.Impl.COLUMN_DESCRIPTION, values, filteredValues);
         filteredValues.put(Downloads.Impl.COLUMN_TOTAL_BYTES, -1);
 
+        if (isPublicApi) {
+            copyInteger(Downloads.Impl.COLUMN_ALLOWED_NETWORK_TYPES, values, filteredValues);
+            copyBoolean(Downloads.Impl.COLUMN_ALLOW_ROAMING, values, filteredValues);
+        }
+
         if (Constants.LOGVV) {
             Log.v(Constants.TAG, "initiating download with UID "
                     + filteredValues.getAsInteger(Constants.UID));
-- 
cgit v1.2.3