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

Commit a8530fe5 authored by Etienne Ruffieux's avatar Etienne Ruffieux
Browse files

SQLiteWrapper cleanup, removed unused checks. 

Removed requery as it was unused, removed out-of-date
memory checks. All functionalities stay the same.
This change was initially made to prevent hidden APIs
usage in the library.

Tag: #feature
Bug: 190441152
Test: atest android.telephony.cts.MmsTest
NoNonSdkCheck: API usage is inside the class and removed with CL
Change-Id: I7498b0cd9e9955158094348acc2c94e0b2552b0d
parent 2a1dc3a8

telephony/common/com/google/android/mms/util/SqliteWrapper.java

+0 −49
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 


package com.google.android.mms.util;



import android.app.ActivityManager;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.ContentResolver;

import android.content.ContentValues;
@@ -25,49 +24,15 @@ import android.content.Context; 
import android.database.Cursor;

import android.database.sqlite.SQLiteException;

import android.net.Uri;

import android.os.Build;

import android.util.Log;

import android.widget.Toast;



public final class SqliteWrapper {

    private static final String TAG = "SqliteWrapper";

    private static final String SQLITE_EXCEPTION_DETAIL_MESSAGE

                = "unable to open database file";



    private SqliteWrapper() {

        // Forbidden being instantiated.

    }



    // FIXME: It looks like outInfo.lowMemory does not work well as we expected.

    // after run command: adb shell fillup -p 100, outInfo.lowMemory is still false.

    private static boolean isLowMemory(Context context) {

        if (null == context) {

            return false;

        }



        ActivityManager am = (ActivityManager)

                        context.getSystemService(Context.ACTIVITY_SERVICE);

        ActivityManager.MemoryInfo outInfo = new ActivityManager.MemoryInfo();

        am.getMemoryInfo(outInfo);



        return outInfo.lowMemory;

    }



    // FIXME: need to optimize this method.

    private static boolean isLowMemory(SQLiteException e) {

        return e.getMessage().equals(SQLITE_EXCEPTION_DETAIL_MESSAGE);

    }



    @UnsupportedAppUsage

    public static void checkSQLiteException(Context context, SQLiteException e) {

        if (isLowMemory(e)) {

            Toast.makeText(context, com.android.internal.R.string.low_memory,

                    Toast.LENGTH_SHORT).show();

        } else {

            throw e;

        }

    }



    @UnsupportedAppUsage

    public static Cursor query(Context context, ContentResolver resolver, Uri uri,

            String[] projection, String selection, String[] selectionArgs, String sortOrder) {
@@ -75,21 +40,10 @@ public final class SqliteWrapper { 
            return resolver.query(uri, projection, selection, selectionArgs, sortOrder);

        } catch (SQLiteException e) {

            Log.e(TAG, "Catch a SQLiteException when query: ", e);

            checkSQLiteException(context, e);

            return null;

        }

    }



    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    public static boolean requery(Context context, Cursor cursor) {

        try {

            return cursor.requery();

        } catch (SQLiteException e) {

            Log.e(TAG, "Catch a SQLiteException when requery: ", e);

            checkSQLiteException(context, e);

            return false;

        }

    }

    @UnsupportedAppUsage

    public static int update(Context context, ContentResolver resolver, Uri uri,

            ContentValues values, String where, String[] selectionArgs) {
@@ -97,7 +51,6 @@ public final class SqliteWrapper { 
            return resolver.update(uri, values, where, selectionArgs);

        } catch (SQLiteException e) {

            Log.e(TAG, "Catch a SQLiteException when update: ", e);

            checkSQLiteException(context, e);

            return -1;

        }

    }
@@ -109,7 +62,6 @@ public final class SqliteWrapper { 
            return resolver.delete(uri, where, selectionArgs);

        } catch (SQLiteException e) {

            Log.e(TAG, "Catch a SQLiteException when delete: ", e);

            checkSQLiteException(context, e);

            return -1;

        }

    }
@@ -121,7 +73,6 @@ public final class SqliteWrapper { 
            return resolver.insert(uri, values);

        } catch (SQLiteException e) {

            Log.e(TAG, "Catch a SQLiteException when insert: ", e);

            checkSQLiteException(context, e);

            return null;

        }

    }