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

Commit 7141c55b authored by Eric Biggers's avatar Eric Biggers
Browse files

SettingsProvider: stop using IPackageManager::isOnlyCoreApps() 

Due to the removal of support for Full Disk Encryption, this method
always returns false.  In preparation for removing it, stop calling it
from SettingsProvider.

Bug: 208476087
Change-Id: I556f2c9be9a829d6449315600c1f57ba75cf01d7
parent 075081aa

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

+1 −11
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.content.ContentValues; 
import android.content.Context;

import android.content.Intent;

import android.content.pm.ActivityInfo;

import android.content.pm.IPackageManager;

import android.content.pm.PackageManager;

import android.content.res.Resources;

import android.content.res.XmlResourceParser;
@@ -35,7 +34,6 @@ import android.net.ConnectivityManager; 
import android.os.Build;

import android.os.Environment;

import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.provider.Settings;
@@ -227,15 +225,7 @@ class DatabaseHelper extends SQLiteOpenHelper { 
        db.execSQL("CREATE INDEX bookmarksIndex2 ON bookmarks (shortcut);");



        // Populate bookmarks table with initial bookmarks

        boolean onlyCore = false;

        try {

            onlyCore = IPackageManager.Stub.asInterface(ServiceManager.getService(

                    "package")).isOnlyCoreApps();

        } catch (RemoteException e) {

        }

        if (!onlyCore) {

        loadBookmarks(db);

        }



        // Load initial volume levels into DB

        loadVolumeLevels(db);