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

Commit eae2c874 authored by Michael W's avatar Michael W
Browse files

PackageManager: Refactor en-/disabling of components 

* Don't use the same code twice, make it reusable

Change-Id: I9fc388f56cea413654a390cb0ccd15a706fb3ad8
parent f11d05f8

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

+18 −23
Original line number Diff line number Diff line
@@ -3183,25 +3183,14 @@ public class PackageManagerService extends IPackageManager.Stub 














            // Disable components marked for disabling at build-time















            mDisabledComponentsList = new ArrayList<ComponentName>();













            disableComponents(mContext.getResources().getStringArray(













                    com.android.internal.R.array.config_deviceDisabledComponents));













            disableComponents(mContext.getResources().getStringArray(













                    com.android.internal.R.array.config_globallyDisabledComponents));













            enableComponents(mContext.getResources().getStringArray(













                    com.android.internal.R.array.config_deviceDisabledComponents), false);













            enableComponents(mContext.getResources().getStringArray(













                    com.android.internal.R.array.config_globallyDisabledComponents), false);





























            // Enable components marked for forced-enable at build-time













            for (String name : mContext.getResources().getStringArray(













                    com.android.internal.R.array.config_forceEnabledComponents)) {













                ComponentName cn = ComponentName.unflattenFromString(name);













                Slog.v(TAG, "Enabling " + name);













                String className = cn.getClassName();













                PackageSetting pkgSetting = mSettings.mPackages.get(cn.getPackageName());













                if (pkgSetting == null || pkgSetting.pkg == null













                        || !pkgSetting.pkg.hasComponentClassName(className)) {













                    Slog.w(TAG, "Unable to enable " + name);













                    continue;













                }













                pkgSetting.enableComponentLPw(className, UserHandle.USER_OWNER);













            }













            enableComponents(mContext.getResources().getStringArray(













                    com.android.internal.R.array.config_forceEnabledComponents), true);





























            // If this is first boot after an OTA, and a normal boot, then















            // we need to clear code cache directories.










@@ -3319,22 +3308,28 @@ public class PackageManagerService extends IPackageManager.Stub













        Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);















    }



























    private void disableComponents(String[] components) {













        // Disable components marked for disabling at build-time













    private void enableComponents(String[] components, boolean enable) {













        // Disable or enable components marked at build-time















        for (String name : components) {















            ComponentName cn = ComponentName.unflattenFromString(name);













            if (!enable) {















                mDisabledComponentsList.add(cn);













            Slog.v(TAG, "Disabling " + name);













            }













            Slog.v(TAG, "Changing enabled state of " + name + " to " + enable);















            String className = cn.getClassName();















            PackageSetting pkgSetting = mSettings.mPackages.get(cn.getPackageName());















            if (pkgSetting == null || pkgSetting.pkg == null















                    || !pkgSetting.pkg.hasComponentClassName(className)) {













                Slog.w(TAG, "Unable to disable " + name);













                Slog.w(TAG, "Unable to change enabled state of " + name + " to " + enable);















                continue;















            }













            if (enable) {













                pkgSetting.enableComponentLPw(className, UserHandle.USER_OWNER);













            } else {















                pkgSetting.disableComponentLPw(className, UserHandle.USER_OWNER);















            }















        }













    }





























    /**















     * Uncompress and install stub applications.