Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d9719c4 authored by Steve Howard's avatar Steve Howard Committed by Android Git Automerger
Browse files

am 5bdb89d7: Merge "Move DownloadManager to android.app (DO NOT MERGE)" into gingerbread 

Merge commit '5bdb89d7' into gingerbread-plus-aosp

* commit '5bdb89d7':
  Move DownloadManager to android.app (DO NOT MERGE)
parents d6c30e8c 5bdb89d7

api/current.xml

+1738 −1738

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/app/ContextImpl.java

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ import android.location.LocationManager; 
import android.media.AudioManager;

import android.net.ConnectivityManager;

import android.net.IConnectivityManager;

import android.net.DownloadManager;

import android.net.ThrottleManager;

import android.net.IThrottleManager;

import android.net.Uri;

core/java/android/net/DownloadManager.java→core/java/android/app/DownloadManager.java

+3 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package android.net;

package android.app;



import android.content.ContentResolver;

import android.content.ContentUris;
@@ -22,6 +22,8 @@ import android.content.ContentValues; 
import android.content.Context;

import android.database.Cursor;

import android.database.CursorWrapper;

import android.net.ConnectivityManager;

import android.net.Uri;

import android.os.Environment;

import android.os.ParcelFileDescriptor;

import android.provider.BaseColumns;

core/java/android/content/Context.java

+3 −3
Original line number Diff line number Diff line
@@ -1207,7 +1207,7 @@ public abstract class Context { 
     * <dt> {@link #UI_MODE_SERVICE} ("uimode")

     * <dd> An {@link android.app.UiModeManager} for controlling UI modes.

     * <dt> {@link #DOWNLOAD_SERVICE} ("download")

     * <dd> A {@link android.net.DownloadManager} for requesting HTTP downloads

     * <dd> A {@link android.app.DownloadManager} for requesting HTTP downloads

     * </dl>

     * 

     * <p>Note:  System services obtained via this API may be closely associated with
@@ -1256,7 +1256,7 @@ public abstract class Context { 
     * @see #UI_MODE_SERVICE

     * @see android.app.UiModeManager

     * @see #DOWNLOAD_SERVICE

     * @see android.net.DownloadManager

     * @see android.app.DownloadManager

     */

    public abstract Object getSystemService(String name);
@@ -1539,7 +1539,7 @@ public abstract class Context { 


    /**

     * Use with {@link #getSystemService} to retrieve a

     * {@link android.net.DownloadManager} for requesting HTTP downloads.

     * {@link android.app.DownloadManager} for requesting HTTP downloads.

     *

     * @see #getSystemService

     */

core/tests/coretests/src/android/net/DownloadManagerBaseTest.java→core/tests/coretests/src/android/app/DownloadManagerBaseTest.java

+4 −4
Original line number Diff line number Diff line
@@ -14,18 +14,18 @@ 
 * limitations under the License.

 */



package android.net;

package android.app;



import android.app.DownloadManager.Query;

import android.app.DownloadManager.Request;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.database.Cursor;

import android.net.ConnectivityManager;

import android.net.DownloadManager;

import android.net.NetworkInfo;

import android.net.DownloadManager.Query;

import android.net.DownloadManager.Request;

import android.net.Uri;

import android.net.wifi.WifiManager;

import android.os.Bundle;

import android.os.Environment;