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

Commit d99d0dc4 authored by Paul Westbrook's avatar Paul Westbrook
Browse files

Enable retrieving default download manager settings 

Enable retrieving the default download manager settings from
a resource, when the SettingsProvider database is created

The default setting for these values is -1, which will cause
DownloadManger to not enforce a limit.

Bug: 3341145
Change-Id: I25294d0f75fb0bdf20d4bef54457056c25c31add
parent 22ad6243

packages/SettingsProvider/res/values/defaults.xml

+5 −0
Original line number Diff line number Diff line
@@ -116,4 +116,9 @@ 


    <!-- Default for Settings.System.USER_ROTATION -->

    <integer name="def_user_rotation">0</integer>



    <!-- Default for Settings.Secure.DOWNLOAD_MAX_BYTES_OVER_MOBILE. <=0 if no limit -->

    <integer name="def_download_manager_max_bytes_over_mobile">-1</integer>

    <!-- Default for Settings.Secure.DOWNLOAD_RECOMMENDED_MAX_BYTES_OVER_MOBILE. <=0 if no limit -->

    <integer name="def_download_manager_recommended_max_bytes_over_mobile">-1</integer>

</resources>

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

+14 −0
Original line number Diff line number Diff line
@@ -1295,6 +1295,20 @@ public class DatabaseHelper extends SQLiteOpenHelper { 


            loadStringSetting(stmt, Settings.Secure.ACCESSIBILITY_WEB_CONTENT_KEY_BINDINGS,

                    R.string.def_accessibility_web_content_key_bindings);



            final int maxBytes = mContext.getResources().getInteger(

                    R.integer.def_download_manager_max_bytes_over_mobile);

            if (maxBytes > 0) {

                loadSetting(stmt, Settings.Secure.DOWNLOAD_MAX_BYTES_OVER_MOBILE,

                        Integer.toString(maxBytes));

            }



            final int recommendedMaxBytes = mContext.getResources().getInteger(

                    R.integer.def_download_manager_recommended_max_bytes_over_mobile);

            if (recommendedMaxBytes > 0) {

                loadSetting(stmt, Settings.Secure.DOWNLOAD_RECOMMENDED_MAX_BYTES_OVER_MOBILE,

                        Integer.toString(recommendedMaxBytes));

            }

        } finally {

            if (stmt != null) stmt.close();

        }