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

Commit 94bf9431 authored by Jake Hamby's avatar Jake Hamby Committed by Android Git Automerger
Browse files

am e7578344: am 5872e9d7: Merge "Allow incoming SMS until internal storage is... 

am e7578344: am 5872e9d7: Merge "Allow incoming SMS until internal storage is almost full." into gingerbread

Merge commit 'e7578344'

* commit 'e7578344':
  Allow incoming SMS until internal storage is almost full.
parents 3dfc5721 e7578344

core/java/android/content/Intent.java

+24 −0
Original line number Diff line number Diff line
@@ -1576,6 +1576,30 @@ public class Intent implements Parcelable, Cloneable { 
     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_DEVICE_STORAGE_OK = "android.intent.action.DEVICE_STORAGE_OK";

    /**

     * Broadcast Action:  A sticky broadcast that indicates a memory full

     * condition on the device. This is intended for activities that want

     * to be able to fill the data partition completely, leaving only

     * enough free space to prevent system-wide SQLite failures.

     *

     * <p class="note">This is a protected intent that can only be sent

     * by the system.

     *

     * {@hide}

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_DEVICE_STORAGE_FULL = "android.intent.action.DEVICE_STORAGE_FULL";

    /**

     * Broadcast Action:  Indicates memory full condition on the device

     * no longer exists.

     *

     * <p class="note">This is a protected intent that can only be sent

     * by the system.

     *

     * {@hide}

     */

    @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)

    public static final String ACTION_DEVICE_STORAGE_NOT_FULL = "android.intent.action.DEVICE_STORAGE_NOT_FULL";

    /**

     * Broadcast Action:  Indicates low memory condition notification acknowledged by user

     * and package management should be started.

core/java/android/provider/Settings.java

+14 −5
Original line number Diff line number Diff line
@@ -3005,31 +3005,31 @@ public final class Settings { 
        public static final String WTF_IS_FATAL = "wtf_is_fatal";



        /**

         * Maximum age of entries kept by {@link android.os.IDropBox}.

         * Maximum age of entries kept by {@link com.android.internal.os.IDropBoxManagerService}.

         * @hide

         */

        public static final String DROPBOX_AGE_SECONDS =

                "dropbox_age_seconds";

        /**

         * Maximum number of entry files which {@link android.os.IDropBox} will keep around.

         * Maximum number of entry files which {@link com.android.internal.os.IDropBoxManagerService} will keep around.

         * @hide

         */

        public static final String DROPBOX_MAX_FILES =

                "dropbox_max_files";

        /**

         * Maximum amount of disk space used by {@link android.os.IDropBox} no matter what.

         * Maximum amount of disk space used by {@link com.android.internal.os.IDropBoxManagerService} no matter what.

         * @hide

         */

        public static final String DROPBOX_QUOTA_KB =

                "dropbox_quota_kb";

        /**

         * Percent of free disk (excluding reserve) which {@link android.os.IDropBox} will use.

         * Percent of free disk (excluding reserve) which {@link com.android.internal.os.IDropBoxManagerService} will use.

         * @hide

         */

        public static final String DROPBOX_QUOTA_PERCENT =

                "dropbox_quota_percent";

        /**

         * Percent of total disk which {@link android.os.IDropBox} will never dip into.

         * Percent of total disk which {@link com.android.internal.os.IDropBoxManagerService} will never dip into.

         * @hide

         */

        public static final String DROPBOX_RESERVE_PERCENT =
@@ -3088,6 +3088,15 @@ public final class Settings { 
        public static final String SYS_STORAGE_THRESHOLD_PERCENTAGE =

                "sys_storage_threshold_percentage";



        /**

         * Minimum bytes of free storage on the device before the data

         * partition is considered full. By default, 1 MB is reserved

         * to avoid system-wide SQLite disk full exceptions.

         * @hide

         */

        public static final String SYS_STORAGE_FULL_THRESHOLD_BYTES =

                "sys_storage_full_threshold_bytes";



        /**

         * The interval in milliseconds after which Wi-Fi is considered idle.

         * When idle, it is possible for the device to be switched from Wi-Fi to

core/res/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ 
    <protected-broadcast android:name="android.intent.action.ACTION_SHUTDOWN" />

    <protected-broadcast android:name="android.intent.action.DEVICE_STORAGE_LOW" />

    <protected-broadcast android:name="android.intent.action.DEVICE_STORAGE_OK" />

    <protected-broadcast android:name="android.intent.action.DEVICE_STORAGE_FULL" />

    <protected-broadcast android:name="android.intent.action.DEVICE_STORAGE_NOT_FULL" />

    <protected-broadcast android:name="android.intent.action.NEW_OUTGOING_CALL" />

    <protected-broadcast android:name="android.intent.action.REBOOT" />

    <protected-broadcast android:name="android.intent.action.DOCK_EVENT" />

services/java/com/android/server/DeviceStorageMonitorService.java

+58 −4
Original line number Diff line number Diff line
@@ -69,10 +69,12 @@ class DeviceStorageMonitorService extends Binder { 
    private static final int DEFAULT_FREE_STORAGE_LOG_INTERVAL_IN_MINUTES = 12*60; //in minutes

    private static final long DEFAULT_DISK_FREE_CHANGE_REPORTING_THRESHOLD = 2 * 1024 * 1024; // 2MB

    private static final long DEFAULT_CHECK_INTERVAL = MONITOR_INTERVAL*60*1000;

    private static final int DEFAULT_FULL_THRESHOLD_BYTES = 1024*1024; // 1MB

    private long mFreeMem;  // on /data

    private long mLastReportedFreeMem;

    private long mLastReportedFreeMemTime;

    private boolean mLowMemFlag=false;

    private boolean mMemFullFlag=false;

    private Context mContext;

    private ContentResolver mContentResolver;

    private long mTotalMemory;  // on /data
@@ -87,9 +89,13 @@ class DeviceStorageMonitorService extends Binder { 
    private boolean mClearingCache;

    private Intent mStorageLowIntent;

    private Intent mStorageOkIntent;

    private Intent mStorageFullIntent;

    private Intent mStorageNotFullIntent;

    private CachePackageDataObserver mClearCacheObserver;

    private static final int _TRUE = 1;

    private static final int _FALSE = 0;

    private long mMemLowThreshold;

    private int mMemFullThreshold;



    /**

     * This string is used for ServiceManager access to this class.
@@ -103,7 +109,7 @@ class DeviceStorageMonitorService extends Binder { 
    Handler mHandler = new Handler() {

        @Override

        public void handleMessage(Message msg) {

            //dont handle an invalid message

            //don't handle an invalid message

            if (msg.what != DEVICE_MEMORY_WHAT) {

                Slog.e(TAG, "Will not process invalid message");

                return;
@@ -184,7 +190,7 @@ class DeviceStorageMonitorService extends Binder { 
        try {

            if (localLOGV) Slog.i(TAG, "Clearing cache");

            IPackageManager.Stub.asInterface(ServiceManager.getService("package")).

                    freeStorageAndNotify(getMemThreshold(), mClearCacheObserver);

                    freeStorageAndNotify(mMemLowThreshold, mClearCacheObserver);

        } catch (RemoteException e) {

            Slog.w(TAG, "Failed to get handle for PackageManger Exception: "+e);

            mClearingCache = false;
@@ -209,8 +215,7 @@ class DeviceStorageMonitorService extends Binder { 
            if (localLOGV)  Slog.v(TAG, "freeMemory="+mFreeMem);



            //post intent to NotificationManager to display icon if necessary

            long memThreshold = getMemThreshold();

            if (mFreeMem < memThreshold) {

            if (mFreeMem < mMemLowThreshold) {

                if (!mLowMemFlag) {

                    if (checkCache) {

                        // See if clearing cache helps
@@ -235,6 +240,17 @@ class DeviceStorageMonitorService extends Binder { 
                    mLowMemFlag = false;

                }

            }

            if (mFreeMem < mMemFullThreshold) {

                if (!mMemFullFlag) {

                    sendFullNotification();

                    mMemFullFlag = true;

                }

            } else {

                if (mMemFullFlag) {

                    cancelFullNotification();

                    mMemFullFlag = false;

                }

            }

        }

        if(localLOGV) Slog.i(TAG, "Posting Message again");

        //keep posting messages to itself periodically
@@ -264,6 +280,20 @@ class DeviceStorageMonitorService extends Binder { 
        return mTotalMemory*value;

    }



    /*

     * just query settings to retrieve the memory full threshold.

     * Preferred this over using a ContentObserver since Settings.Secure caches the value

     * any way

     */

    private int getMemFullThreshold() {

        int value = Settings.Secure.getInt(

                              mContentResolver,

                              Settings.Secure.SYS_STORAGE_FULL_THRESHOLD_BYTES,

                              DEFAULT_FULL_THRESHOLD_BYTES);

        if(localLOGV) Slog.v(TAG, "Full Threshold Bytes="+value);

        return value;

    }



    /**

    * Constructor to run service. initializes the disk space threshold value

    * and posts an empty message to kickstart the process.
@@ -283,6 +313,13 @@ class DeviceStorageMonitorService extends Binder { 
        mStorageLowIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);

        mStorageOkIntent = new Intent(Intent.ACTION_DEVICE_STORAGE_OK);

        mStorageOkIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);

        mStorageFullIntent = new Intent(Intent.ACTION_DEVICE_STORAGE_FULL);

        mStorageFullIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);

        mStorageNotFullIntent = new Intent(Intent.ACTION_DEVICE_STORAGE_NOT_FULL);

        mStorageNotFullIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);

        // cache storage thresholds

        mMemLowThreshold = getMemThreshold();

        mMemFullThreshold = getMemFullThreshold();

        checkMemory(true);

    }
@@ -332,6 +369,23 @@ class DeviceStorageMonitorService extends Binder { 
        mContext.sendBroadcast(mStorageOkIntent);

    }



    /**

     * Send a notification when storage is full.

     */

    private final void sendFullNotification() {

        if(localLOGV) Slog.i(TAG, "Sending memory full notification");

        mContext.sendStickyBroadcast(mStorageFullIntent);

    }



    /**

     * Cancels memory full notification and sends "not full" intent.

     */

    private final void cancelFullNotification() {

        if(localLOGV) Slog.i(TAG, "Canceling memory full notification");

        mContext.removeStickyBroadcast(mStorageFullIntent);

        mContext.sendBroadcast(mStorageNotFullIntent);

    }



    public void updateMemory() {

        int callingUid = getCallingUid();

        if(callingUid != Process.SYSTEM_UID) {

telephony/java/com/android/internal/telephony/SMSDispatcher.java

+6 −6
Original line number Diff line number Diff line
@@ -32,9 +32,11 @@ import android.database.Cursor; 
import android.database.SQLException;

import android.net.Uri;

import android.os.AsyncResult;

import android.os.Environment;

import android.os.Handler;

import android.os.Message;

import android.os.PowerManager;

import android.os.StatFs;

import android.provider.Telephony;

import android.provider.Telephony.Sms.Intents;

import android.provider.Settings;
@@ -240,11 +242,9 @@ public abstract class SMSDispatcher extends Handler { 


        // Register for device storage intents.  Use these to notify the RIL

        // that storage for SMS is or is not available.

        // TODO: Revisit this for a later release.  Storage reporting should

        // rely more on application indication.

        IntentFilter filter = new IntentFilter();

        filter.addAction(Intent.ACTION_DEVICE_STORAGE_LOW);

        filter.addAction(Intent.ACTION_DEVICE_STORAGE_OK);

        filter.addAction(Intent.ACTION_DEVICE_STORAGE_FULL);

        filter.addAction(Intent.ACTION_DEVICE_STORAGE_NOT_FULL);

        mContext.registerReceiver(mResultReceiver, filter);

    }
@@ -966,10 +966,10 @@ public abstract class SMSDispatcher extends Handler { 
    private BroadcastReceiver mResultReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {

            if (intent.getAction().equals(Intent.ACTION_DEVICE_STORAGE_LOW)) {

            if (intent.getAction().equals(Intent.ACTION_DEVICE_STORAGE_FULL)) {

                mStorageAvailable = false;

                mCm.reportSmsMemoryStatus(false, obtainMessage(EVENT_REPORT_MEMORY_STATUS_DONE));

            } else if (intent.getAction().equals(Intent.ACTION_DEVICE_STORAGE_OK)) {

            } else if (intent.getAction().equals(Intent.ACTION_DEVICE_STORAGE_NOT_FULL)) {

                mStorageAvailable = true;

                mCm.reportSmsMemoryStatus(true, obtainMessage(EVENT_REPORT_MEMORY_STATUS_DONE));

            } else {