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

Commit 7da5f9ed authored by Manjeet Rulhania's avatar Manjeet Rulhania Committed by Android (Google) Code Review
Browse files

Merge "Handle sqlite disk full error when executing sql command" into main

parents 31703e9b b7f27623

services/core/java/com/android/server/appop/DiscreteOpsDbHelper.java

+11 −5
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ import android.database.DatabaseErrorHandler; 
import android.database.DefaultDatabaseErrorHandler;

import android.database.DefaultDatabaseErrorHandler;

import android.database.sqlite.SQLiteDatabase;

import android.database.sqlite.SQLiteDatabase;

import android.database.sqlite.SQLiteException;

import android.database.sqlite.SQLiteException;

import android.database.sqlite.SQLiteFullException;

import android.database.sqlite.SQLiteOpenHelper;

import android.database.sqlite.SQLiteOpenHelper;

import android.database.sqlite.SQLiteRawStatement;

import android.database.sqlite.SQLiteRawStatement;

import android.os.Environment;

import android.os.Environment;
@@ -174,12 +175,17 @@ class DiscreteOpsDbHelper extends SQLiteOpenHelper { 
        if (DEBUG) {

        if (DEBUG) {

            Slog.i(LOG_TAG, "DB execSQL, sql: " + sql);

            Slog.i(LOG_TAG, "DB execSQL, sql: " + sql);

        }

        }

        try {

            SQLiteDatabase db = getWritableDatabase();

            SQLiteDatabase db = getWritableDatabase();

            if (bindArgs == null) {

            if (bindArgs == null) {

                db.execSQL(sql);

                db.execSQL(sql);

            } else {

            } else {

                db.execSQL(sql, bindArgs);

                db.execSQL(sql, bindArgs);

            }

            }

        } catch (SQLiteFullException exception) {

            Slog.e(LOG_TAG, "Couldn't exec sql command, disk is full. Discrete ops "

                    + "db file size (bytes) : " + getDatabaseFile().length(), exception);

        }

    }

    }





    /**

    /**