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

Commit 836057ee authored by Fan Zhang's avatar Fan Zhang Committed by android-build-merger
Browse files

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

am: 31c29dd8

Change-Id: I536a54a9da2ab90e30c866305b35973d1976d184
parents 5b0c9e8d 31c29dd8

packages/SettingsLib/src/com/android/settingslib/dream/DreamBackend.java

+4 −3
Original line number Diff line number Diff line
@@ -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) {