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

Commit 9ee4f596 authored by Dave Mankoff's avatar Dave Mankoff
Browse files

RESTRICT AUTOMERGE Remove the possibility of an NPE that is being seen in master. 

This code is not actually doing anything useful in QPR1, so best to
simply remove it.


Bug: 140950258
Test: manual
Change-Id: I53abdef77a93ad854935f79e431d9861b40c2427
parent c2327e54

packages/SystemUI/src/com/android/systemui/SystemUIAppComponentFactory.java

+0 −23
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
package com.android.systemui;



import android.app.Application;

import android.app.Service;

import android.content.Intent;



import androidx.core.app.CoreComponentFactory;
@@ -52,25 +50,4 @@ public class SystemUIAppComponentFactory extends CoreComponentFactory { 


        return app;

    }



    @Override

    public Service instantiateService(ClassLoader cl, String className, Intent intent)

            throws InstantiationException, IllegalAccessException, ClassNotFoundException {

        Service service = mComponentHelper.resolve(className);

        if (service != null) {

            return checkCompatWrapper(service);

        }

        return super.instantiateService(cl, className, intent);

    }



    static <T> T checkCompatWrapper(T obj) {

        if (obj instanceof CompatWrapped) {

            T wrapper = (T) ((CompatWrapped) obj).getWrapper();

            if (wrapper != null) {

                return wrapper;

            }

        }



        return obj;

    }

}