kirin970-common: Kill DisplayModeControl and related bits

* This never worked on P

Change-Id: Ib942c1ea6c8ddee1230d0690e2688fb304ec0802

16 files changed, 0 insertions, 657 deletions

diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 344d56b..c7fe251 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -61,10 +61,6 @@ TARGET_USES_HWC2 := true
 TARGET_INIT_VENDOR_LIB := libinit_kirin970
 TARGET_RECOVERY_DEVICE_MODULES := libinit_kirin970
 
-# Lineage hardware
-JAVA_SOURCE_OVERLAYS := \
-    org.lineageos.hardware|$(VENDOR_PATH)/lineagehw|**/*.java
-
 # Partitions
 BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
@@ -103,8 +99,3 @@ BOARD_PLAT_PUBLIC_SEPOLICY_DIR += $(VENDOR_PATH)/sepolicy/public
 ifneq ($(TARGET_BUILD_VARIANT),user)
 SELINUX_IGNORE_NEVERALLOWS := true
 endif
-
-# Shims
-TARGET_LD_SHIM_LIBS := \
-    /system/lib64/libdisplayengineservice.so|libshims_hwsmartdisplay_jni.so \
-    /system/lib64/libhwsmartdisplay_jni.so|libshims_hwsmartdisplay_jni.so
diff --git a/kirin970.mk b/kirin970.mk
index 81c2df7..999476e 100644
--- a/kirin970.mk
+++ b/kirin970.mk
@@ -71,6 +71,3 @@ PRODUCT_BOOT_JARS += \
 PRODUCT_PACKAGES += \
     resize2fs_static
 
-# Shims
-PRODUCT_PACKAGES += \
-    libshims_hwsmartdisplay_jni
diff --git a/lineagehw/src/org/lineageos/hardware/DisplayEngineService.java b/lineagehw/src/org/lineageos/hardware/DisplayEngineService.java
deleted file mode 100644
index 6b971cc..0000000
--- a/lineagehw/src/org/lineageos/hardware/DisplayEngineService.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (C) 2018 The LineageOS Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.server.display;
-
-import android.os.IBinder;
-import android.os.Parcel;
-import android.os.PersistableBundle;
-import android.os.ServiceManager;
-
-public class DisplayEngineService {
-    private static final String DESCRIPTOR = "com.huawei.displayengine.IDisplayEngineService";
-    private static final int TRANSACTION_getSupported = 1;
-    private static final int TRANSACTION_setScene = 2;
-    private static final int TRANSACTION_setData = 3;
-    private static final int TRANSACTION_getEffect = 4;
-    private static final int TRANSACTION_setEffect = 5;
-
-    private static IBinder sDisplayEngineService;
-
-    static {
-        sDisplayEngineService = ServiceManager.getService("DisplayEngineService");
-    }
-
-    public int getSupported(int feature) {
-        if (sDisplayEngineService == null) {
-            return -1;
-        }
-
-        Parcel data = Parcel.obtain();
-        Parcel reply = Parcel.obtain();
-
-        try {
-            data.writeInterfaceToken(DESCRIPTOR);
-            data.writeInt(feature);
-
-            sDisplayEngineService.transact(TRANSACTION_getSupported, data, reply, 0);
-
-            reply.readException();
-            return reply.readInt();
-        } catch (Throwable t) {
-            return -1;
-        } finally {
-            data.recycle();
-            reply.recycle();
-        }
-    }
-
-    public int setScene(int scene, int action) {
-        if (sDisplayEngineService == null) {
-            return -1;
-        }
-
-        Parcel data = Parcel.obtain();
-        Parcel reply = Parcel.obtain();
-
-        try {
-            data.writeInterfaceToken(DESCRIPTOR);
-            data.writeInt(scene);
-            data.writeInt(action);
-
-            sDisplayEngineService.transact(TRANSACTION_setScene, data, reply, 0);
-
-            reply.readException();
-            return reply.readInt();
-        } catch (Throwable t) {
-            return -1;
-        } finally {
-            data.recycle();
-            reply.recycle();
-        }
-    }
-
-    public int setData(int type, PersistableBundle bundleData) {
-        if (sDisplayEngineService == null) {
-            return -1;
-        }
-
-        Parcel data = Parcel.obtain();
-        Parcel reply = Parcel.obtain();
-
-        try {
-            data.writeInterfaceToken(DESCRIPTOR);
-            data.writeInt(type);
-
-            if (bundleData != null) {
-                data.writeInt(1);
-                bundleData.writeToParcel(data, 0);
-            } else {
-                data.writeInt(0);
-            }
-
-            sDisplayEngineService.transact(TRANSACTION_setData, data, reply, 0);
-
-            reply.readException();
-            return reply.readInt();
-        } catch (Throwable t) {
-            return -1;
-        } finally {
-            data.recycle();
-            reply.recycle();
-        }
-    }
-
-    public int getEffect(int feature, int type, byte[] status, int length) {
-        if (sDisplayEngineService == null) {
-            return -1;
-        }
-
-        Parcel data = Parcel.obtain();
-        Parcel reply = Parcel.obtain();
-
-        try {
-            data.writeInterfaceToken(DESCRIPTOR);
-            data.writeInt(feature);
-            data.writeInt(type);
-            data.writeByteArray(status);
-            data.writeInt(length);
-
-            sDisplayEngineService.transact(TRANSACTION_getEffect, data, reply, 0);
-
-            reply.readException();
-            return reply.readInt();
-        } catch (Throwable t) {
-            return -1;
-        } finally {
-            data.recycle();
-            reply.recycle();
-        }
-    }
-
-    public int setEffect(int feature, int mode, PersistableBundle bundleData) {
-        if (sDisplayEngineService == null) {
-            return -1;
-        }
-
-        Parcel data = Parcel.obtain();
-        Parcel reply = Parcel.obtain();
-
-        try {
-            data.writeInterfaceToken(DESCRIPTOR);
-            data.writeInt(feature);
-            data.writeInt(mode);
-
-            if (bundleData != null) {
-                data.writeInt(1);
-                bundleData.writeToParcel(data, 0);
-            } else {
-                data.writeInt(0);
-            }
-
-            sDisplayEngineService.transact(TRANSACTION_setEffect, data, reply, 0);
-
-            reply.readException();
-            return reply.readInt();
-        } catch (Throwable t) {
-            return -1;
-        } finally {
-            data.recycle();
-            reply.recycle();
-        }
-    }
-
-    public boolean isColorModeSupported() {
-        return false;
-    }
-
-    public int enableColorMode(boolean enable) {
-        return -1;
-    }
-
-    public int enablePowerMode(boolean enable) {
-        return -1;
-    }
-
-    public int setBootComplete(boolean enable) {
-        return -1;
-    }
-}
\ No newline at end of file
diff --git a/lineagehw/src/org/lineageos/hardware/DisplayEngineService_V1_1.java b/lineagehw/src/org/lineageos/hardware/DisplayEngineService_V1_1.java
deleted file mode 100644
index 8681b29..0000000
--- a/lineagehw/src/org/lineageos/hardware/DisplayEngineService_V1_1.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
- * Copyright (C) 2018 The LineageOS Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.server.display;
-
-import com.android.server.display.DisplayEngineService;
-
-public class DisplayEngineService_V1_1 extends DisplayEngineService {
-    public static final int DE_ACTION_START = 0;
-    public static final int DE_ACTION_STOP = 1;
-    public static final int DE_ACTION_PAUSE = 2;
-    public static final int DE_ACTION_RESUME = 3;
-    public static final int DE_ACTION_FULLSCREEN_START = 4;
-    public static final int DE_ACTION_FULLSCREEN_STOP = 5;
-    public static final int DE_ACTION_FULLSCREEN_PAUSE = 6;
-    public static final int DE_ACTION_FULLSCREEN_RESUME = 7;
-    public static final int DE_ACTION_FULLSCREEN_EXIT = 8;
-    public static final int DE_ACTION_THUMBNAIL = 9;
-    public static final int DE_ACTION_FULLSCREEN_VIEW = 10;
-    public static final int DE_ACTION_LIVE_IMAGE = 11;
-    public static final int DE_ACTION_ONLINE_FULLSCREEN_VIEW = 12;
-    public static final int DE_ACTION_IMAGE_EXIT = 13;
-    public static final int DE_ACTION_ENTER = 14;
-    public static final int DE_ACTION_EXIT = 15;
-    public static final int DE_ACTION_MODE_ON = 16;
-    public static final int DE_ACTION_MODE_OFF = 17;
-    public static final int DE_ACTION_MOTION_HOME = 18;
-    public static final int DE_ACTION_MOTION_APP = 19;
-    public static final int DE_ACTION_MOTION_RECENT = 20;
-    public static final int DE_ACTION_MOTION_START = 21;
-    public static final int DE_ACTION_MAX = 22;
-
-    public static final int DE_ACTION_PG_DEFAULT_FRONT = 10000;
-    public static final int DE_ACTION_PG_BROWSER_FRONT = 10001;
-    public static final int DE_ACTION_PG_3DGAME_FRONT = 10002;
-    public static final int DE_ACTION_PG_EBOOK_FRONT = 10003;
-    public static final int DE_ACTION_PG_GALLERY_FRONT = 10004;
-    public static final int DE_ACTION_PG_INPUT_START = 10005;
-    public static final int DE_ACTION_PG_INPUT_END = 10006;
-    public static final int DE_ACTION_PG_CAMERA_FRONT = 10007;
-    public static final int DE_ACTION_PG_OFFICE_FRONT = 10008;
-    public static final int DE_ACTION_PG_VIDEO_FRONT = 10009;
-    public static final int DE_ACTION_PG_LAUNCHER_FRONT = 10010;
-    public static final int DE_ACTION_PG_2DGAME_FRONT = 10011;
-    public static final int DE_ACTION_PG_MMS_FRONT = 10013;
-    public static final int DE_ACTION_PG_VIDEO_START = 10015;
-    public static final int DE_ACTION_PG_VIDEO_END = 10016;
-    public static final int DE_ACTION_PG_CAMERA_END = 10017;
-    public static final int DE_ACTION_PG_MAX = 10018;
-
-    public static final int DE_ALGORITHM_IMAGEPROCESS = 0;
-    public static final int DE_ALGORITHM_BRIGHTNESSTRAINING = 1;
-    public static final int DE_ALGORITHM_MAX = 2;
-
-    public static final int DE_DATA_TYPE_IMAGE = 0;
-    public static final int DE_DATA_TYPE_VIDEO = 1;
-    public static final int DE_DATA_TYPE_VIDEO_HDR10 = 2;
-    public static final int DE_DATA_TYPE_CAMERA = 3;
-    public static final int DE_DATA_TYPE_IMAGE_INFO = 4;
-    public static final int DE_DATA_TYPE_XNIT = 5;
-    public static final int DE_DATA_TYPE_XNIT_BRIGHTLEVEL = 6;
-    public static final int DE_DATA_TYPE_3D_COLORTEMP = 7;
-    public static final int DE_DATA_TYPE_RGLED = 8;
-    public static final int DE_DATA_TYPE_AMBIENTPARAM = 9;
-    public static final int DE_DATA_TYPE_IAWARE = 10;
-    public static final int DE_DATA_MAX = 11;
-
-    public static final int DE_EFFECT_TYPE_PANEL_NAME = 0;
-    public static final int DE_EFFECT_TYPE_HBM_INFO = 1;
-    public static final int DE_EFFECT_TYPE_PANEL_INFO = 2;
-    public static final int DE_EFFECT_TYPE_PANEL_VERSION = 3;
-    public static final int DE_EFFECT_TYPE_IS_IMAGE = 4;
-    public static final int DE_EFFECT_MAX = 5;
-
-    public static final int DE_FEATURE_SHARP = 0;
-    public static final int DE_FEATURE_CONTRAST = 1;
-    public static final int DE_FEATURE_BLC = 2;
-    public static final int DE_FEATURE_GMP = 3;
-    public static final int DE_FEATURE_XCC = 4;
-    public static final int DE_FEATURE_HUE = 5;
-    public static final int DE_FEATURE_SAT = 6;
-    public static final int DE_FEATURE_GAMMA = 7;
-    public static final int DE_FEATURE_IGAMMA = 8;
-    public static final int DE_FEATURE_LRE = 9;
-    public static final int DE_FEATURE_SRE = 10;
-    public static final int DE_FEATURE_COLORMODE = 11;
-    public static final int DE_FEATURE_CABC = 12;
-    public static final int DE_FEATURE_RGBW = 13;
-    public static final int DE_FEATURE_PANELINFO = 14;
-    public static final int DE_FEATURE_HDR10 = 15;
-    public static final int DE_FEATURE_XNIT = 16;
-    public static final int DE_FEATURE_EYE_PROTECT = 17;
-    public static final int DE_FEATURE_3D_COLOR_TEMPERATURE = 18;
-    public static final int DE_FEATURE_RGLED = 19;
-    public static final int DE_FEATURE_HBM = 20;
-    public static final int DE_FEATURE_EYE_PROTECT_WITHCT = 21;
-    public static final int DE_FEATURE_SHARP2P = 22;
-    public static final int DE_FEATURE_NATURAL_TONE = 23;
-    public static final int DE_FEATURE_ACL = 24;
-    public static final int DE_FEATURE_AMOLED = 25;
-    public static final int DE_FEATURE_READING = 26;
-    public static final int DE_FEATURE_MAX = 27;
-
-    public static final int DE_SCENE_PG = 0;
-    public static final int DE_SCENE_VIDEO = 1;
-    public static final int DE_SCENE_VIDEO_HDR10 = 2;
-    public static final int DE_SCENE_IMAGE = 3;
-    public static final int DE_SCENE_CAMERA = 4;
-    public static final int DE_SCENE_UI = 5;
-    public static final int DE_SCENE_WEB = 6;
-    public static final int DE_SCENE_WECHAT = 7;
-    public static final int DE_SCENE_QQ = 8;
-    public static final int DE_SCENE_TAOBAO = 9;
-    public static final int DE_SCENE_POWERMODE = 10;
-    public static final int DE_SCENE_COLORTEMP = 11;
-    public static final int DE_SCENE_SRE = 12;
-    public static final int DE_SCENE_COLORMODE = 13;
-    public static final int DE_SCENE_PROCAMERA = 14;
-    public static final int DE_SCENE_EYEPROTECTION = 15;
-    public static final int DE_SCENE_XNIT = 16;
-    public static final int DE_SCENE_PG_EX = 17;
-    public static final int DE_SCENE_BOOT_CMPL = 18;
-    public static final int DE_SCENE_3D_COLORTMP = 19;
-    public static final int DE_SCENE_RGLED = 20;
-    public static final int DE_SCENE_BACKLIGHT_CHANGE = 21;
-    public static final int DE_SCENE_HBM_BACKLIGHT = 22;
-    public static final int DE_SCENE_VIDEO_APP = 23;
-    public static final int DE_SCENE_REAL_POWERMODE = 24;
-    public static final int DE_SCENE_NATURAL_TONE = 25;
-    public static final int DE_SCENE_BACKLIGHT = 26;
-    public static final int DE_SCENE_BACKLIGHT_MANUAL = 27;
-    public static final int DE_SCENE_HBM_DIMMING = 28;
-    public static final int DE_SCENE_FINGER_PRINT = 29;
-    public static final int DE_SCENE_UD_FINGER_PRINT_LOCK = 30;
-    public static final int DE_SCENE_UD_ENROLL_FINGER_PRINT = 31;
-    public static final int DE_SCENE_UD_USER_PRESENT = 32;
-    public static final int DE_SCENE_AOD = 33;
-    public static final int DE_SCENE_FINGERPRINT_HBM = 34;
-    public static final int DE_SCENE_MMITEST = 35;
-    public static final int DE_SCENE_GAME = 36;
-    public static final int DE_SCENE_READMODE = 37;
-    public static final int DE_SCENE_MOTION = 38;
-    public static final int DE_SCENE_MAX = 39;
-
-    @Override
-    public boolean isColorModeSupported() {
-        return getSupported(DE_FEATURE_COLORMODE) == 1;
-    }
-
-    @Override
-    public int enableColorMode(boolean enable) {
-        return setScene(DE_SCENE_COLORMODE, enable ? DE_ACTION_MODE_ON : DE_ACTION_MODE_OFF);
-    }
-
-    @Override
-    public int enablePowerMode(boolean enable) {
-        return setScene(DE_SCENE_POWERMODE, enable ? DE_ACTION_MODE_ON : DE_ACTION_MODE_OFF);
-    }
-
-    @Override
-    public int setBootComplete(boolean enable) {
-        return setScene(DE_SCENE_BOOT_CMPL, enable ? DE_ACTION_MODE_ON : DE_ACTION_MODE_OFF);
-    }
-}
\ No newline at end of file
diff --git a/lineagehw/src/org/lineageos/hardware/DisplayModeControl.java b/lineagehw/src/org/lineageos/hardware/DisplayModeControl.java
deleted file mode 100644
index 97411a4..0000000
--- a/lineagehw/src/org/lineageos/hardware/DisplayModeControl.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Copyright (C) 2018 The LineageOS Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.lineageos.hardware;
-
-import com.android.server.display.DisplayEngineService;
-import com.android.server.display.DisplayEngineService_V1_1;
-
-import lineageos.hardware.DisplayMode;
-import org.lineageos.internal.util.FileUtils;
-
-/*
- * Display Modes API
- *
- * A device may implement a list of preset display modes for different
- * viewing intents, such as movies, photos, or extra vibrance. These
- * modes may have multiple components such as gamma correction, white
- * point adjustment, etc, but are activated by a single control point.
- *
- * This API provides support for enumerating and selecting the
- * modes supported by the hardware.
- */
-
-public class DisplayModeControl {
-    private static final String DEFAULT_PATH = "/data/misc/.displaymodedefault";
-    private static final DisplayMode[] DISPLAY_MODES = {
-        new DisplayMode(0, "Normal"),
-        new DisplayMode(1, "Vivid"),
-    };
-
-    private static DisplayEngineService sDisplayEngineService;
-    private static int sColorEnhancementCurrentMode;
-
-    static {
-        try {
-            sDisplayEngineService = new DisplayEngineService_V1_1();
-            sColorEnhancementCurrentMode = 0;
-
-            sDisplayEngineService.setBootComplete(true);
-            sDisplayEngineService.enablePowerMode(true);
-
-            if (FileUtils.isFileReadable(DEFAULT_PATH)) {
-                setMode(getDefaultMode(), false);
-            } else {
-                /* If default mode is not set yet, set current mode as default */
-                setMode(getCurrentMode(), true);
-            }
-        } catch (Throwable t) {
-            // Ignore, DisplayEngineService not available.
-        }
-    }
-
-    /*
-     * All HAF classes should export this boolean.
-     * Real implementations must, of course, return true
-     */
-    public static boolean isSupported() {
-        return sDisplayEngineService != null &&
-                sDisplayEngineService.isColorModeSupported() &&
-                FileUtils.isFileWritable(DEFAULT_PATH) &&
-                FileUtils.isFileReadable(DEFAULT_PATH);
-    }
-
-    /*
-     * Get the list of available modes. A mode has an integer
-     * identifier and a string name.
-     *
-     * It is the responsibility of the upper layers to
-     * map the name to a human-readable format or perform translation.
-     */
-    public static DisplayMode[] getAvailableModes() {
-        if (sDisplayEngineService == null) {
-            return new DisplayMode[0];
-        }
-        return DISPLAY_MODES;
-    }
-
-    /*
-     * Get the name of the currently selected mode. This can return
-     * null if no mode is selected.
-     */
-    public static DisplayMode getCurrentMode() {
-        if (sDisplayEngineService == null) {
-            return null;
-        }
-        return DISPLAY_MODES[sColorEnhancementCurrentMode];
-    }
-
-    /*
-     * Selects a mode from the list of available modes by it's
-     * string identifier. Returns true on success, false for
-     * failure. It is up to the implementation to determine
-     * if this mode is valid.
-     */
-    public static boolean setMode(DisplayMode mode, boolean makeDefault) {
-        if (sDisplayEngineService == null) {
-            return false;
-        }
-        sColorEnhancementCurrentMode = mode.id;
-        if (sColorEnhancementCurrentMode == 0) {
-            sDisplayEngineService.enableColorMode(false);
-        } else if (sColorEnhancementCurrentMode == 1) {
-            sDisplayEngineService.enableColorMode(true);
-        }
-        if (makeDefault) {
-            FileUtils.writeLine(DEFAULT_PATH, String.valueOf(sColorEnhancementCurrentMode));
-        }
-        return true;
-    }
-
-    /*
-     * Gets the preferred default mode for this device by it's
-     * string identifier. Can return null if there is no default.
-     */
-    public static DisplayMode getDefaultMode() {
-        if (sDisplayEngineService == null) {
-            return null;
-        }
-        try {
-            int mode = Integer.parseInt(FileUtils.readOneLine(DEFAULT_PATH));
-            return DISPLAY_MODES[mode];
-        } catch (NumberFormatException | ArrayIndexOutOfBoundsException e) {
-            return null;
-        }
-    }
-}
diff --git a/lineagehw/src/org/lineageos/hardware/HwSmartDisplayService.java b/lineagehw/src/org/lineageos/hardware/HwSmartDisplayService.java
deleted file mode 100644
index eea3d7e..0000000
--- a/lineagehw/src/org/lineageos/hardware/HwSmartDisplayService.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2018 The LineageOS Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.server;
-
-public class HwSmartDisplayService {
-    public native void init_native();
-    public native void finalize_native();
-
-    public native int nativeGetFeatureSupported(int feature);
-
-    public native int nativeGetDisplayEffectSupported(int type);
-    public native int nativeSetDisplayEffectParam(int type, int[] buffer, int length);
-    public native int nativeSetDisplayEffectScene(int scene);
-
-    public native void nativeSetSmartDisplay(int mode, int value);
-
-    static {
-        System.loadLibrary("hwsmartdisplay_jni");
-    }
-}
diff --git a/proprietary-files.txt b/proprietary-files.txt
index e555a6b..31ec9db 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1919,18 +1919,6 @@ etc/charger/public/800_serial/scp_charging_22.png
 etc/charger/public/800_serial/scp_charging_23.png
 -sbin/charger:sbin/chargeonlymode;rootfs|124a478904a2bd08e2a1e6c4a1bdc4ab124743d4
 
-# Display engine
-bin/displayengineserver
-etc/init/displayengineserver.rc
-lib64/libc_secshared.so 
-lib64/libdisplayengineservice.so
-lib64/libhuaweicust.so 
-lib64/vendor.huawei.hardware.graphics.displayeffect@1.0.so
-lib64/vendor.huawei.hardware.graphics.displayeffect@1.1.so
-lib64/vendor.huawei.hardware.graphics.displayeffect@1.2.so
-lib64/vendor.huawei.hardware.hwdisplay.displayengine@1.0.so
-lib64/vendor.huawei.hardware.hwdisplay.displayengine@1.1.so
-
 # HotwordEnrollment
 -priv-app/HotwordEnrollmentOKGoogleHI6403/HotwordEnrollmentOKGoogleHI6403.apk;PRESIGNED|8faf6d751b0f258678cb6ad9b5dff332483fbf82
 -priv-app/HotwordEnrollmentXGoogleHI6403/HotwordEnrollmentXGoogleHI6403.apk;PRESIGNED|7e8376ad34941bd68194540d1977e36b1e1b6d74
@@ -1938,10 +1926,6 @@ lib64/vendor.huawei.hardware.hwdisplay.displayengine@1.1.so
 # Radio
 emui/base/global/ons.bin:ons.bin
 
-# SmartDisplay
-lib/libhwsmartdisplay_jni.so
-lib64/libhwsmartdisplay_jni.so
-
 # Turbo
 etc/permissions/privapp-permissions-turbo.xml
 etc/sysconfig/turbo.xml
diff --git a/sepolicy/private/displayengineserver.te b/sepolicy/private/displayengineserver.te
deleted file mode 100644
index 899c911..0000000
--- a/sepolicy/private/displayengineserver.te
+++ /dev/null
@@ -1,34 +0,0 @@
-type displayengineserver_exec, exec_type, file_type;
-
-typeattribute displayengineserver coredomain;
-typeattribute displayengineserver halclientdomain;
-
-# Allow for transition from init domain to displayengineserver
-init_daemon_domain(displayengineserver)
-
-# Allow displayengineserver to use binder service
-binder_use(displayengineserver)
-
-# Allow binder communication with surfaceflinger
-binder_call(displayengineserver, surfaceflinger)
-
-# Allow displayengineserver to add and find display_engine_service
-allow displayengineserver display_engine_service:service_manager { add find };
-
-# Allow displayengineserver to find displayengine_hwservice
-allow displayengineserver displayengine_hwservice:hwservice_manager find;
-
-# Allow displayengineserver to find surfaceflinger_service
-allow displayengineserver surfaceflinger_service:service_manager find;
-
-# Allow displayengineserver to find 3rd party apps hwservice
-allow displayengineserver untrusted_app_visible_hisi_hwservice:hwservice_manager find;
-
-# Allow displayengineserver to read inside /data/cust
-allow displayengineserver cust_data_file:lnk_file read;
-
-# Allow displayengineserver to call binder displayeffect
-binder_call(displayengineserver, displayeffect)
-
-# Allow displayengineserver to call binder hal_displayengine_default
-binder_call(displayengineserver, hal_displayengine_default)
diff --git a/sepolicy/private/file_contexts b/sepolicy/private/file_contexts
index 6baa417..4804d7a 100644
--- a/sepolicy/private/file_contexts
+++ b/sepolicy/private/file_contexts
@@ -41,7 +41,6 @@
 
 # Binaries
 /system/bin/bfm-ctl                u:object_r:bfm-ctl_exec:s0
-/system/bin/displayengineserver    u:object_r:displayengineserver_exec:s0
 
 # Configs
 /system/etc/audio_policy_configuration.xml    u:object_r:vendor_configs_file:s0
diff --git a/sepolicy/private/service_contexts b/sepolicy/private/service_contexts
index 34e86c0..7c9ecec 100644
--- a/sepolicy/private/service_contexts
+++ b/sepolicy/private/service_contexts
@@ -1,3 +1,2 @@
-DisplayEngineService    u:object_r:display_engine_service:s0
 extphone                u:object_r:radio_service:s0
 IDisplayEffectClient    u:object_r:untrusted_app_visible_hisi_hwservice:s0
diff --git a/sepolicy/private/system_server.te b/sepolicy/private/system_server.te
index def5980..d732d65 100644
--- a/sepolicy/private/system_server.te
+++ b/sepolicy/private/system_server.te
@@ -1,15 +1,9 @@
-# Allow binder communication with displayengineserver
-binder_call(system_server, displayengineserver)
-
 # Allow system_server to read and write to sysfs_fingerprint
 allow system_server sysfs_fingerprint:file rw_file_perms;
 
 # Allow system_server to read and write to sysfs_touchscreen
 allow system_server sysfs_touchscreen:file rw_file_perms;
 
-# Allow system_server to find display_engine_service
-allow system_server display_engine_service:service_manager find;
-
 # Allow system_server to find hal_ext_fingerprint_hwservice
 allow system_server hal_ext_fingerprint_hwservice:hwservice_manager find;
 
diff --git a/sepolicy/public/displayengineserver.te b/sepolicy/public/displayengineserver.te
deleted file mode 100644
index 37246bb..0000000
--- a/sepolicy/public/displayengineserver.te
+++ /dev/null
@@ -1 +0,0 @@
-type displayengineserver, domain;
diff --git a/sepolicy/public/hwservice.te b/sepolicy/public/hwservice.te
index e078dbd..3f5b000 100644
--- a/sepolicy/public/hwservice.te
+++ b/sepolicy/public/hwservice.te
@@ -1,3 +1,2 @@
 type default_hisi_hwservice, hwservice_manager_type;
-type displayengine_hwservice, hwservice_manager_type;
 type hal_ext_fingerprint_hwservice, hwservice_manager_type;
diff --git a/sepolicy/public/service.te b/sepolicy/public/service.te
index f39fd2a..717071b 100644
--- a/sepolicy/public/service.te
+++ b/sepolicy/public/service.te
@@ -1,2 +1 @@
-type display_engine_service, service_manager_type;
 type untrusted_app_visible_hisi_hwservice, service_manager_type;
diff --git a/shims/Android.mk b/shims/Android.mk
deleted file mode 100644
index 534334c..0000000
--- a/shims/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# Copyright (C) 2018 The LineageOS Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := hwsmartdisplay_jni.c
-
-LOCAL_MODULE := libshims_hwsmartdisplay_jni
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/shims/hwsmartdisplay_jni.c b/shims/hwsmartdisplay_jni.c
deleted file mode 100644
index 76432a4..0000000
--- a/shims/hwsmartdisplay_jni.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (C) 2018 The LineageOS Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-void _ZN7android21SurfaceComposerClient16refreshLastFrameEv() {}