diff options
author | Dianne Hackborn <hackbod@google.com> | 2012-11-28 18:05:36 -0800 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2012-11-28 18:09:01 -0800 |
commit | 13579ed3305bf89b41a9fa88e1347f0e0769d279 (patch) | |
tree | 705a6b10c05895d2acf7a17d5a70d1c952bce4d8 /packages/SettingsProvider | |
parent | 71175f727bc1e094e72a410aca62392badffbf11 (diff) | |
download | frameworks_base-13579ed3305bf89b41a9fa88e1347f0e0769d279.zip frameworks_base-13579ed3305bf89b41a9fa88e1347f0e0769d279.tar.gz frameworks_base-13579ed3305bf89b41a9fa88e1347f0e0769d279.tar.bz2 |
Cleaner initial boot.
This does some cleanup of the initial boot, especially when
booting in "no core apps" mode for encryption/decryption.
Change-Id: Ifb3949f580e52f54559e603c4b0b104f6bac2f6c
Diffstat (limited to 'packages/SettingsProvider')
-rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index b649b43..4e5fc37 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -21,6 +21,7 @@ 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.XmlResourceParser; import android.database.Cursor; @@ -31,6 +32,8 @@ import android.media.AudioManager; import android.media.AudioService; import android.net.ConnectivityManager; import android.os.Environment; +import android.os.RemoteException; +import android.os.ServiceManager; import android.os.SystemProperties; import android.os.UserHandle; import android.provider.Settings; @@ -171,7 +174,15 @@ public class DatabaseHelper extends SQLiteOpenHelper { db.execSQL("CREATE INDEX bookmarksIndex2 ON bookmarks (shortcut);"); // Populate bookmarks table with initial bookmarks - loadBookmarks(db); + 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); |