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

Keep PluginManager reference to avoid NPE

Browse Source 
Test: manual
Change-Id: Ie7ff3eca7a9a02afff0a12d64ec8e40f136ed8d4
Fixes: 118969577
(cherry picked from commit c8a01350d3)
This commit is contained in:
Lucas Dupin
2018-11-16 11:31:33 -08:00
parent 64ca10b75b
commit 5d378dfeac
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/doze/DozeService.java
View File

@@ -38,6 +38,7 @@ public class DozeService extends DreamService
private DozeMachine mDozeMachine; private DozeMachine mDozeMachine;
private DozeServicePlugin mDozePlugin; private DozeServicePlugin mDozePlugin;
private PluginManager mPluginManager;
public DozeService() { public DozeService() {
setDebug(DEBUG); setDebug(DEBUG);
@@ -53,14 +54,14 @@ public class DozeService extends DreamService
finish(); finish();
return; return;
} }
Dependency.get(PluginManager.class).addPluginListener(this, mPluginManager = Dependency.get(PluginManager.class);
DozeServicePlugin.class, false /* Allow multiple */); mPluginManager.addPluginListener(this, DozeServicePlugin.class, false /* allowMultiple */);
mDozeMachine = new DozeFactory().assembleMachine(this); mDozeMachine = new DozeFactory().assembleMachine(this);
} }
@Override @Override
public void onDestroy() { public void onDestroy() {
Dependency.get(PluginManager.class).removePluginListener(this); mPluginManager.removePluginListener(this);
super.onDestroy(); super.onDestroy();
mDozeMachine = null; mDozeMachine = null;
} }