InstallerFactory: Check for privext before checking if apk to be installed is privext

* Move the privileged extension installed check above
  the check whether the apk to be installed is privext.
* This lets privext updates work when it is already installed.
This commit is contained in:
Chirayu Desai 2017-03-29 15:11:28 +05:30
parent befdc4a850
commit 0bce5cebe6

View File

@ -45,12 +45,12 @@ public class InstallerFactory {
}
Installer installer;
if (apk.packageName.equals(PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME)) {
// special case for installing "Privileged Extension" with root
installer = new ExtensionInstaller(context, apk);
} else if (PrivilegedInstaller.isDefault(context)) {
if (PrivilegedInstaller.isDefault(context)) {
Utils.debugLog(TAG, "privileged extension correctly installed -> PrivilegedInstaller");
installer = new PrivilegedInstaller(context, apk);
} else if (apk.packageName.equals(PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME)) {
// special case for installing "Privileged Extension" with root
installer = new ExtensionInstaller(context, apk);
} else {
installer = new DefaultInstaller(context, apk);
}