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

Commit 7637e39d authored by Surajit Chandra's avatar Surajit Chandra Committed by Android (Google) Code Review
Browse files

Revert "Turn ContentProvider injection failures into errors." 

This reverts commit 75f5cbea.

Reason for revert: Test revert b/324314127

Change-Id: I3bcceed2d2d55afa2053910b0c0e5d5e7fb4bc0d
parent 75f5cbea

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

+5 −6
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.content.BroadcastReceiver 
import android.content.ContentProvider

import android.content.Context

import android.content.Intent

import android.util.Log

import androidx.core.app.AppComponentFactory

import com.android.systemui.dagger.ContextComponentHelper

import com.android.systemui.dagger.SysUIComponent
@@ -90,8 +91,7 @@ abstract class SystemUIAppComponentFactoryBase : AppComponentFactory() { 
        return app

    }



    @UsesReflection(

            KeepTarget(instanceOfClassConstant = SysUIComponent::class, methodName = "inject"))

    @UsesReflection(KeepTarget(instanceOfClassConstant = SysUIComponent::class, methodName = "inject"))

    override fun instantiateProviderCompat(cl: ClassLoader, className: String): ContentProvider {

        val contentProvider = super.instantiateProviderCompat(cl, className)

        if (contentProvider is ContextInitializer) {
@@ -103,12 +103,11 @@ abstract class SystemUIAppComponentFactoryBase : AppComponentFactory() { 
                        .getMethod("inject", contentProvider.javaClass)

                    injectMethod.invoke(rootComponent, contentProvider)

                } catch (e: NoSuchMethodException) {

                    throw RuntimeException("No injector for class: " + contentProvider.javaClass, e)

                    Log.w(TAG, "No injector for class: " + contentProvider.javaClass, e)

                } catch (e: IllegalAccessException) {

                    throw RuntimeException("Injector inaccessible for class: " +

                            contentProvider.javaClass, e)

                    Log.w(TAG, "No injector for class: " + contentProvider.javaClass, e)

                } catch (e: InvocationTargetException) {

                    throw RuntimeException("Error while injecting: " + contentProvider.javaClass, e)

                    Log.w(TAG, "No injector for class: " + contentProvider.javaClass, e)

                }

                initializer

            }