From 7141c55b876db807359cd24c7eb82225f554a918 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Fri, 15 Apr 2022 21:34:24 +0000 Subject: [PATCH] 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 --- .../android/providers/settings/DatabaseHelper.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index b851232ace828..85d0b1820474a 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -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); - } + loadBookmarks(db); // Load initial volume levels into DB loadVolumeLevels(db);