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

Commit e1cbd0a8 authored by Vasu Nori's avatar Vasu Nori
Browse files

Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb" 

This reverts commit 6bc710f7, reversing
changes made to 7ba35f5a.
parent 8275c608

api/11.xml

+0 −11
Original line number Original line Diff line number Diff line
@@ -29418,17 +29418,6 @@ 
<parameter name="uri" type="android.net.Uri">

<parameter name="uri" type="android.net.Uri">

</parameter>

</parameter>

</method>

</method>

<method name="setDownloadToBeOtaUpdate"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="setMimeType"

<method name="setMimeType"

 return="android.app.DownloadManager.Request"

 return="android.app.DownloadManager.Request"

 abstract="false"

 abstract="false"

api/current.xml

+0 −11
Original line number Original line Diff line number Diff line
@@ -29418,17 +29418,6 @@ 
<parameter name="uri" type="android.net.Uri">

<parameter name="uri" type="android.net.Uri">

</parameter>

</parameter>

</method>

</method>

<method name="setDownloadToBeOtaUpdate"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="setMimeType"

<method name="setMimeType"

 return="android.app.DownloadManager.Request"

 return="android.app.DownloadManager.Request"

 abstract="false"

 abstract="false"

core/java/android/app/DownloadManager.java

+0 −9
Original line number Original line Diff line number Diff line
@@ -339,7 +339,6 @@ public class DownloadManager { 
        private boolean mIsVisibleInDownloadsUi = true;

        private boolean mIsVisibleInDownloadsUi = true;

        private boolean mScannable = false;

        private boolean mScannable = false;

        private boolean mUseSystemCache = false;

        private boolean mUseSystemCache = false;

        private boolean mOtaUpdate = false;

        /** if a file is designated as a MediaScanner scannable file, the following value is

        /** if a file is designated as a MediaScanner scannable file, the following value is

         * stored in the database column {@link Downloads.Impl#COLUMN_MEDIA_SCANNED}.

         * stored in the database column {@link Downloads.Impl#COLUMN_MEDIA_SCANNED}.

         */

         */
@@ -605,13 +604,6 @@ public class DownloadManager { 
            return this;

            return this;

        }

        }





        /**

         * Set whether the download request is OTA Update. By default, it is set to false.

         */

        public void setDownloadToBeOtaUpdate() {

            mOtaUpdate = true;

        }



        /**

        /**

         * Set whether this download should be displayed in the system's Downloads UI. True by

         * Set whether this download should be displayed in the system's Downloads UI. True by

         * default.

         * default.
@@ -658,7 +650,6 @@ public class DownloadManager { 
            values.put(Downloads.Impl.COLUMN_ALLOWED_NETWORK_TYPES, mAllowedNetworkTypes);

            values.put(Downloads.Impl.COLUMN_ALLOWED_NETWORK_TYPES, mAllowedNetworkTypes);

            values.put(Downloads.Impl.COLUMN_ALLOW_ROAMING, mRoamingAllowed);

            values.put(Downloads.Impl.COLUMN_ALLOW_ROAMING, mRoamingAllowed);

            values.put(Downloads.Impl.COLUMN_IS_VISIBLE_IN_DOWNLOADS_UI, mIsVisibleInDownloadsUi);

            values.put(Downloads.Impl.COLUMN_IS_VISIBLE_IN_DOWNLOADS_UI, mIsVisibleInDownloadsUi);

            values.put(Downloads.Impl.COLUMN_IGNORE_SIZE_LIMITS, mOtaUpdate);





            return values;

            return values;

        }

        }

core/java/android/provider/Downloads.java

+0 −6
Original line number Original line Diff line number Diff line
@@ -397,12 +397,6 @@ public final class Downloads { 
         */

         */

        public static final String COLUMN_LAST_UPDATESRC = "lastUpdateSrc";

        public static final String COLUMN_LAST_UPDATESRC = "lastUpdateSrc";





        /** Set this column to true if the given download should ignore the mobile network

         * download limits.

         * <P>Type: Boolean</P>

         */

        public static final String COLUMN_IGNORE_SIZE_LIMITS = "otaupdate";



        /**

        /**

         * default value for {@link #COLUMN_LAST_UPDATESRC}.

         * default value for {@link #COLUMN_LAST_UPDATESRC}.

         * This value is used when this column's value is not relevant.

         * This value is used when this column's value is not relevant.