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

Commit edd0f31f authored by Chris Soyars's avatar Chris Soyars Committed by Steve Kondik
Browse files

Renamed local Settings class to DynamicSettings to avoid conflicts.

parent fb41575b

services/java/com/android/server/PackageManagerService.java

+7 −4
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ import android.os.Process; 
import android.os.ServiceManager;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.provider.Settings;

import android.util.*;

import android.view.Display;

import android.view.WindowManager;
@@ -218,7 +219,7 @@ class PackageManagerService extends IPackageManager.Stub { 
    final HashMap<String, PackageParser.Package> mPackages =

            new HashMap<String, PackageParser.Package>();



    final Settings mSettings;

    final DynamicSettings mSettings;

    boolean mRestoredSettings;

    boolean mReportedUidError;
@@ -323,7 +324,7 @@ class PackageManagerService extends IPackageManager.Stub { 
        mFactoryTest = factoryTest;

        mNoDexOpt = "eng".equals(SystemProperties.get("ro.build.type"));

        mMetrics = new DisplayMetrics();

        mSettings = new Settings();

        mSettings = new DynamicSettings();

        mSettings.addSharedUserLP("android.uid.system",

                Process.SYSTEM_UID, ApplicationInfo.FLAG_SYSTEM);

        mSettings.addSharedUserLP("android.uid.phone",
@@ -3549,6 +3550,8 @@ class PackageManagerService extends IPackageManager.Stub { 
    public void installPackage(final Uri packageURI, final IPackageInstallObserver observer, final int flags, final String installerPackageName) {

    	Boolean a2sd = false;



    	a2sd = Settings.Secure.getInt(mContext.getContentResolver(),Settings.Secure.APPS2SD, 0) > 0;

    	

    	ContentResolver cr = mContext.getContentResolver();

    	Cursor c = cr.query(DUCKTAPE_SETTINGS, new String[] { "value" }, "key='apps2sd'", null, null);

    	c.moveToFirst();
@@ -5838,7 +5841,7 @@ class PackageManagerService extends IPackageManager.Stub { 
    /**

     * Holds information about dynamic settings.

     */

    private static final class Settings {

    private static final class DynamicSettings {

        private final File mSettingsFilename;

        private final File mBackupSettingsFilename;

        private final HashMap<String, PackageSetting> mPackages =
@@ -5908,7 +5911,7 @@ class PackageManagerService extends IPackageManager.Stub { 
        private final ArrayList<PendingPackage> mPendingPackages

                = new ArrayList<PendingPackage>();



        Settings() {

        DynamicSettings() {

            File dataDir = Environment.getDataDirectory();

            File systemDir = new File(dataDir, "system");

            systemDir.mkdirs();