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

Commit 5743d870 authored by Sunny Goyal's avatar Sunny Goyal
Browse files

resolve merge conflicts of b56090af to ub-launcher3-master. 

Change-Id: I2ef9a25b70815efe37109004517a7c3077ffa22e
parents 3c0adb07 b56090af

src/com/android/launcher3/BuildInfo.java

deleted100644 → 0
+0 −9
Original line number Diff line number Diff line 
package com.android.launcher3;



// TODO: Remove this class once all its references are gone.

public class BuildInfo {



    public boolean isDogfoodBuild() {

        return false;

    }

}

src/com/android/launcher3/LauncherAppState.java

+5 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import com.android.launcher3.accessibility.LauncherAccessibilityDelegate; 
import com.android.launcher3.compat.LauncherAppsCompat;

import com.android.launcher3.compat.PackageInstallerCompat;

import com.android.launcher3.compat.UserManagerCompat;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.util.ConfigMonitor;

import com.android.launcher3.util.TestingUtils;

import com.android.launcher3.util.Thunk;
@@ -173,4 +174,8 @@ public class LauncherAppState { 
    public InvariantDeviceProfile getInvariantDeviceProfile() {

        return mInvariantDeviceProfile;

    }



    public static boolean isDogfoodBuild() {

        return FeatureFlags.IS_ALPHA_BUILD || FeatureFlags.IS_DEV_BUILD;

    }

}