diff --git a/vending-app/src/main/AndroidManifest.xml b/vending-app/src/main/AndroidManifest.xml index 073caa0bd..16a64c792 100644 --- a/vending-app/src/main/AndroidManifest.xml +++ b/vending-app/src/main/AndroidManifest.xml @@ -20,10 +20,13 @@ - - + + + diff --git a/vending-app/src/main/java/org/microg/vending/WorkAccountChangedReceiver.kt b/vending-app/src/main/java/org/microg/vending/WorkAccountChangedReceiver.kt index 803ce4836..32af2f730 100644 --- a/vending-app/src/main/java/org/microg/vending/WorkAccountChangedReceiver.kt +++ b/vending-app/src/main/java/org/microg/vending/WorkAccountChangedReceiver.kt @@ -6,6 +6,7 @@ import android.content.ComponentName import android.content.Context import android.content.Intent import android.content.pm.PackageManager +import android.os.Build import android.util.Log import org.microg.vending.ui.VendingActivity @@ -15,17 +16,20 @@ class WorkAccountChangedReceiver : BroadcastReceiver() { val accountManager = AccountManager.get(context) val hasWorkAccounts = accountManager.getAccountsByType("com.google.work").isNotEmpty() - Log.d(TAG, "setting VendingActivity state to enabled = $hasWorkAccounts") - val componentName = ComponentName( - context, - VendingActivity::class.java - ) - context.packageManager.setComponentEnabledSetting( - componentName, - if (hasWorkAccounts) PackageManager.COMPONENT_ENABLED_STATE_ENABLED else PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, - 0 - ) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + Log.d(TAG, "setting VendingActivity state to enabled = $hasWorkAccounts") + + val componentName = ComponentName( + context, + VendingActivity::class.java + ) + context.packageManager.setComponentEnabledSetting( + componentName, + if (hasWorkAccounts) PackageManager.COMPONENT_ENABLED_STATE_ENABLED else PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, + 0 + ) + } } companion object {