Merge "Take a context to start setting intent in DreamBackend" into pi-dev

This commit is contained in:
TreeHugger Robot
2018-11-07 18:27:45 +00:00
committed by Android (Google) Code Review

View File

@@ -256,11 +256,12 @@ public class DreamBackend {
}
}
public void launchSettings(DreamInfo dreamInfo) {
public void launchSettings(Context uiContext, DreamInfo dreamInfo) {
logd("launchSettings(%s)", dreamInfo);
if (dreamInfo == null || dreamInfo.settingsComponentName == null)
if (dreamInfo == null || dreamInfo.settingsComponentName == null) {
return;
mContext.startActivity(new Intent().setComponent(dreamInfo.settingsComponentName));
}
uiContext.startActivity(new Intent().setComponent(dreamInfo.settingsComponentName));
}
public void preview(DreamInfo dreamInfo) {