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

Commit 49b8705c authored by Joshua Trask's avatar Joshua Trask Committed by Automerger Merge Worker
Browse files

Merge "ChooserSelector shouldn't crash w/o IntentResolver" into tm-qpr-dev am:... 

Merge "ChooserSelector shouldn't crash w/o IntentResolver" into tm-qpr-dev am: 562d88f2 am: ad75b709

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20177863



Change-Id: I8cd0b12569a0515f6ed02259654d2ac2aad1e59b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9d1c923a ad75b709

packages/SystemUI/src/com/android/systemui/ChooserSelector.kt

+6 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ package com.android.systemui 
import android.content.ComponentName

import android.content.Context

import android.content.pm.PackageManager

import android.util.Log

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.dagger.qualifiers.Background
@@ -55,7 +56,11 @@ class ChooserSelector @Inject constructor( 
        } else {

            PackageManager.COMPONENT_ENABLED_STATE_DISABLED

        }

        try {

            packageManager.setComponentEnabledSetting(chooserComponent, newState, /* flags = */ 0)

        } catch (e: IllegalArgumentException) {

            Log.w("ChooserSelector", "Unable to set IntentResolver enabled=" + enabled, e)

        }

    }



    suspend inline fun awaitCancellation(): Nothing = suspendCancellableCoroutine { }