Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "RESTRICT AUTOMERGE Remove the possibility of an NPE that is being seen in master." into qt-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-09-13 21:13:17 +00:00
committed by Android (Google) Code Review
parent 0bff8bb2ef 9ee4f596b6
commit 421f0d367d
1 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/SystemUI/src/com/android/systemui/SystemUIAppComponentFactory.java
View File

@@ -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;
}
}