Merge "systemcontrol: clean up framebuffer operation in user space. [2/2]" into o-amlogic

14 files changed, 35 insertions, 177 deletions

diff --git a/core/java/com/droidlogic/app/DisplayPositionManager.java b/core/java/com/droidlogic/app/DisplayPositionManager.java
index 316b73b..04cd0cd 100644
--- a/core/java/com/droidlogic/app/DisplayPositionManager.java
+++ b/core/java/com/droidlogic/app/DisplayPositionManager.java
@@ -8,7 +8,6 @@ public class DisplayPositionManager {
     private final static boolean DEBUG = false;

     private Context mContext = null;

     private SystemControlManager mSystenControl = null;

-    SystemControlManager.DisplayInfo mDisplayInfo;

     private OutputModeManager mOutputModeManager = null;

 

     private final static int MAX_Height = 100;

@@ -45,7 +44,6 @@ public class DisplayPositionManager {
         mContext = context;

         mSystenControl = new SystemControlManager(mContext);

         mOutputModeManager = new OutputModeManager(mContext);

-        mDisplayInfo = mSystenControl.getDisplayInfo();

         initPostion();

     }

 

diff --git a/core/java/com/droidlogic/app/OutputModeManager.java b/core/java/com/droidlogic/app/OutputModeManager.java
index d4b5e58..e5bfc85 100644
--- a/core/java/com/droidlogic/app/OutputModeManager.java
+++ b/core/java/com/droidlogic/app/OutputModeManager.java
@@ -138,18 +138,12 @@ public class OutputModeManager {
     final Object mLock = new Object[0];
 
     private SystemControlManager mSystenControl;
-    SystemControlManager.DisplayInfo mDisplayInfo;
     private HdmiControlManager mHdmiControlManager;
 
     public OutputModeManager(Context context) {
         mContext = context;
 
         mSystenControl = new SystemControlManager(context);
-        mDisplayInfo = mSystenControl.getDisplayInfo();
-        if (DEBUG && mDisplayInfo.defaultUI != null) {
-            Log.d(TAG, "output mode, display type [1:tablet 2:MBOX 3:TV]: "
-                + mDisplayInfo.type + ", default output:" + mDisplayInfo.defaultUI);
-        }
 
         currentOutputmode = readSysfs(DISPLAY_MODE);
 
@@ -413,11 +407,9 @@ public class OutputModeManager {
     public void setHdmiUnPlugged(){
         Log.d(TAG, "setHdmiUnPlugged");
 
-        if (REAL_OUTPUT_SOC.contains(mDisplayInfo.socType)) {
-            if (getPropertyBoolean(PROP_HDMI_ONLY, true)) {
-                String cvbsmode = getBootenv(ENV_CVBS_MODE, "576cvbs");
-                setOutputMode(cvbsmode);
-            }
+        if (getPropertyBoolean(PROP_HDMI_ONLY, true)) {
+            String cvbsmode = getBootenv(ENV_CVBS_MODE, "576cvbs");
+            setOutputMode(cvbsmode);
         }
     }
 
@@ -425,21 +417,19 @@ public class OutputModeManager {
         boolean isAutoMode = isBestOutputmode() || readSupportList(HDMI_SUPPORT_LIST).contains("null edid");
 
         Log.d(TAG, "setHdmiPlugged auto mode: " + isAutoMode);
-        if (REAL_OUTPUT_SOC.contains(mDisplayInfo.socType)) {
-            if (getPropertyBoolean(PROP_HDMI_ONLY, true)) {
-                if (isAutoMode) {
-                    if (SystemControlManager.USE_BEST_MODE) {
-                        setOutputMode(getBestMatchResolution());
-                    } else {
-                        setOutputMode(getHighestMatchResolution());
-                    }
+        if (getPropertyBoolean(PROP_HDMI_ONLY, true)) {
+            if (isAutoMode) {
+                if (SystemControlManager.USE_BEST_MODE) {
+                    setOutputMode(getBestMatchResolution());
                 } else {
-                    String mode = getSupportedResolution();
-                    setOutputMode(mode);
+                    setOutputMode(getHighestMatchResolution());
                 }
+            } else {
+                String mode = getSupportedResolution();
+                setOutputMode(mode);
             }
-            switchHdmiPassthough();
         }
+        switchHdmiPassthough();
     }
 
     public boolean isBestOutputmode() {
diff --git a/core/java/com/droidlogic/app/SystemControlManager.java b/core/java/com/droidlogic/app/SystemControlManager.java
index d1face1..e7bd86d 100644
--- a/core/java/com/droidlogic/app/SystemControlManager.java
+++ b/core/java/com/droidlogic/app/SystemControlManager.java
@@ -324,7 +324,7 @@ public class SystemControlManager {
     }
 
     public DisplayInfo getDisplayInfo() {
-        DisplayInfo info = new DisplayInfo();
+        /*DisplayInfo info = new DisplayInfo();
         synchronized (mLock) {
             Mutable<DroidDisplayInfo> resultInfo = new Mutable<>();
             try {
@@ -348,9 +348,9 @@ public class SystemControlManager {
             } catch (RemoteException e) {
                 Log.e(TAG, "getDisplayInfo:" + e);
             }
-        }
+        }*/
 
-        return info;
+        return null;
     }
 
     public void loopMountUnmount(boolean isMount, String path){
@@ -795,7 +795,7 @@ public class SystemControlManager {
     }
 
     public static class DisplayInfo{
-        //1:tablet 2:MBOX 3:TV
+        /*//1:tablet 2:MBOX 3:TV
         public int type;
         public String socType;
         public String defaultUI;
@@ -807,6 +807,6 @@ public class SystemControlManager {
         public int fb1Width;
         public int fb1Height;
         public int fb1FbBits;
-        public boolean fb1TripleEnable;//Triple Buffer enable or not
+        public boolean fb1TripleEnable;//Triple Buffer enable or not*/
     }
 }
diff --git a/services/systemcontrol/DisplayMode.cpp b/services/systemcontrol/DisplayMode.cpp
index 64f8599..6569157 100644
--- a/services/systemcontrol/DisplayMode.cpp
+++ b/services/systemcontrol/DisplayMode.cpp
@@ -174,14 +174,6 @@ DisplayMode::DisplayMode(const char *path) {
 
 DisplayMode::DisplayMode(const char *path, Ubootenv *ubootenv)
     :mDisplayType(DISPLAY_TYPE_MBOX),
-    mFb0Width(-1),
-    mFb0Height(-1),
-    mFb0FbBits(-1),
-    mFb0TripleEnable(true),
-    mFb1Width(-1),
-    mFb1Height(-1),
-    mFb1FbBits(-1),
-    mFb1TripleEnable(true),
     mDisplayWidth(FULL_WIDTH_1080),
     mDisplayHeight(FULL_HEIGHT_1080),
     mLogLevel(LOG_LEVEL_DEFAULT) {
@@ -211,9 +203,7 @@ void DisplayMode::init() {
 
     SYS_LOGI("display mode init type: %d [0:none 1:tablet 2:mbox 3:tv], soc type:%s, default UI:%s",
         mDisplayType, mSocType, mDefaultUI);
-    if (DISPLAY_TYPE_TABLET == mDisplayType) {
-        setTabletDisplay();
-    } else if (DISPLAY_TYPE_MBOX == mDisplayType) {
+    if (DISPLAY_TYPE_MBOX == mDisplayType) {
         pTxAuth = new HDCPTxAuth();
         pTxAuth->setUevntCallback(this);
         pTxAuth->setFRAutoAdpt(new FrameRateAutoAdaption(this));
@@ -249,9 +239,7 @@ void DisplayMode::reInit() {
     if (strcmp(boot_type, "snapshotted")) {
         SYS_LOGI("display mode reinit type: %d [0:none 1:tablet 2:mbox 3:tv], soc type:%s, default UI:%s",
             mDisplayType, mSocType, mDefaultUI);
-        if (DISPLAY_TYPE_TABLET == mDisplayType) {
-            setTabletDisplay();
-        } else if ((DISPLAY_TYPE_MBOX == mDisplayType) || (DISPLAY_TYPE_REPEATER == mDisplayType)) {
+        if ((DISPLAY_TYPE_MBOX == mDisplayType) || (DISPLAY_TYPE_REPEATER == mDisplayType)) {
             setSourceDisplay(OUPUT_MODE_STATE_POWER);
         } else if (DISPLAY_TYPE_TV == mDisplayType) {
             setSinkDisplay(false);
@@ -267,28 +255,6 @@ HDCPTxAuth *DisplayMode:: geTxAuth() {
     return pTxAuth;
 }
 
-void DisplayMode:: getDisplayInfo(int &type, char* socType, char* defaultUI) {
-    type = mDisplayType;
-    if (NULL != socType)
-        strcpy(socType, mSocType);
-
-    if (NULL != defaultUI)
-        strcpy(defaultUI, mDefaultUI);
-}
-
-void DisplayMode:: getFbInfo(int &fb0w, int &fb0h, int &fb0bits, int &fb0trip,
-        int &fb1w, int &fb1h, int &fb1bits, int &fb1trip) {
-    fb0w = mFb0Width;
-    fb0h = mFb0Height;
-    fb0bits = mFb0FbBits;
-    fb0trip = mFb0TripleEnable?1:0;
-
-    fb1w = mFb1Width;
-    fb1h = mFb1Height;
-    fb1bits = mFb1FbBits;
-    fb1trip = mFb1TripleEnable?1:0;
-}
-
 void DisplayMode::setLogLevel(int level){
     mLogLevel = level;
 }
@@ -331,30 +297,7 @@ int DisplayMode::parseConfigFile(){
             if (!tokenizer->isEol() && tokenizer->peekChar() != '#') {
 
                 char *token = tokenizer->nextToken(WHITESPACE);
-                if(!strcmp(token, DEVICE_STR_MID)){
-                    mDisplayType = DISPLAY_TYPE_TABLET;
-
-                    tokenizer->skipDelimiters(WHITESPACE);
-                    strcpy(mSocType, tokenizer->nextToken(WHITESPACE));
-                    tokenizer->skipDelimiters(WHITESPACE);
-                    mFb0Width = atoi(tokenizer->nextToken(WHITESPACE));
-                    tokenizer->skipDelimiters(WHITESPACE);
-                    mFb0Height = atoi(tokenizer->nextToken(WHITESPACE));
-                    tokenizer->skipDelimiters(WHITESPACE);
-                    mFb0FbBits = atoi(tokenizer->nextToken(WHITESPACE));
-                    tokenizer->skipDelimiters(WHITESPACE);
-                    mFb0TripleEnable = (0 == atoi(tokenizer->nextToken(WHITESPACE)))?false:true;
-
-                    tokenizer->skipDelimiters(WHITESPACE);
-                    mFb1Width = atoi(tokenizer->nextToken(WHITESPACE));
-                    tokenizer->skipDelimiters(WHITESPACE);
-                    mFb1Height = atoi(tokenizer->nextToken(WHITESPACE));
-                    tokenizer->skipDelimiters(WHITESPACE);
-                    mFb1FbBits = atoi(tokenizer->nextToken(WHITESPACE));
-                    tokenizer->skipDelimiters(WHITESPACE);
-                    mFb1TripleEnable = (0 == atoi(tokenizer->nextToken(WHITESPACE)))?false:true;
-
-                } else if (!strcmp(token, DEVICE_STR_MBOX)) {
+                if (!strcmp(token, DEVICE_STR_MBOX)) {
                     mDisplayType = DISPLAY_TYPE_MBOX;
 
                     tokenizer->skipDelimiters(WHITESPACE);
@@ -385,40 +328,6 @@ int DisplayMode::parseConfigFile(){
     return status;
 }
 
-void DisplayMode::setTabletDisplay() {
-    struct fb_var_screeninfo var_set;
-
-    var_set.xres = mFb0Width;
-	var_set.yres = mFb0Height;
-	var_set.xres_virtual = mFb0Width;
-    if(mFb0TripleEnable)
-	    var_set.yres_virtual = 3*mFb0Height;
-    else
-        var_set.yres_virtual = 2*mFb0Height;
-	var_set.bits_per_pixel = mFb0FbBits;
-    setFbParameter(DISPLAY_FB0, var_set);
-
-    pSysWrite->writeSysfs(DISPLAY_FB1_BLANK, "1");
-    var_set.xres = mFb1Width;
-	var_set.yres = mFb1Height;
-	var_set.xres_virtual = mFb1Width;
-    if (mFb1TripleEnable)
-	    var_set.yres_virtual = 3*mFb1Height;
-    else
-        var_set.yres_virtual = 2*mFb1Height;
-	var_set.bits_per_pixel = mFb1FbBits;
-    setFbParameter(DISPLAY_FB1, var_set);
-
-    char axis[512] = {0};
-    sprintf(axis, "%d %d %d %d %d %d %d %d",
-        0, 0, mFb0Width, mFb0Height, 0, 0, mFb1Width, mFb1Height);
-
-    pSysWrite->writeSysfs(SYSFS_DISPLAY_MODE, "panel");
-    pSysWrite->writeSysfs(SYSFS_DISPLAY_AXIS, axis);
-
-    pSysWrite->writeSysfs(DISPLAY_FB0_BLANK, "0");
-}
-
 void DisplayMode::setSourceDisplay(output_mode_state state) {
     hdmi_data_t data;
     char outputmode[MODE_LEN] = {0};
@@ -1109,17 +1018,6 @@ void DisplayMode::setSinkDisplay(bool initState) {
     setSinkOutputMode(outputmode, initState);
 }
 
-void DisplayMode::setFbParameter(const char* fbdev, struct fb_var_screeninfo var_set) {
-    struct fb_var_screeninfo var_old;
-
-    int fh = open(fbdev, O_RDONLY);
-    ioctl(fh, FBIOGET_VSCREENINFO, &var_old);
-
-    copy_changed_values(&var_old, &var_set);
-    ioctl(fh, FBIOPUT_VSCREENINFO, &var_old);
-    close(fh);
-}
-
 int DisplayMode::getBootenvInt(const char* key, int defaultVal) {
     int value = defaultVal;
     const char* p_value = mUbootenv->getValue(key);
@@ -1563,16 +1461,6 @@ int DisplayMode::dump(char *result) {
     sprintf(buf, "\ndisplay type: %d [0:none 1:tablet 2:mbox 3:tv], soc type:%s\n", mDisplayType, mSocType);
     strcat(result, buf);
 
-    if (DISPLAY_TYPE_TABLET == mDisplayType) {
-        sprintf(buf, "fb0 width:%d height:%d fbbits:%d triple buffer enable:%d\n",
-            mFb0Width, mFb0Height, mFb0FbBits, (int)mFb0TripleEnable);
-        strcat(result, buf);
-
-        sprintf(buf, "fb1 width:%d height:%d fbbits:%d triple buffer enable:%d\n",
-            mFb1Width, mFb1Height, mFb1FbBits, (int)mFb1TripleEnable);
-        strcat(result, buf);
-    }
-
     if ((DISPLAY_TYPE_MBOX == mDisplayType) || (DISPLAY_TYPE_REPEATER == mDisplayType)) {
         sprintf(buf, "default ui:%s\n", mDefaultUI);
         strcat(result, buf);
diff --git a/services/systemcontrol/DisplayMode.h b/services/systemcontrol/DisplayMode.h
index 827a5da..91ba7ba 100644
--- a/services/systemcontrol/DisplayMode.h
+++ b/services/systemcontrol/DisplayMode.h
@@ -67,8 +67,6 @@ using namespace android;
 #else
 #define DISPLAY_CFG_FILE                "/system/etc/mesondisplay.cfg"
 #endif
-#define DISPLAY_FB0                     "/dev/graphics/fb0"
-#define DISPLAY_FB1                     "/dev/graphics/fb1"
 #define SYSFS_DISPLAY_MODE              "/sys/class/display/mode"
 #define SYSFS_DISPLAY_MODE2             "/sys/class/display2/mode"
 //when close freescale, will enable display axis, cut framebuffer output
@@ -390,10 +388,6 @@ public:
     void init();
     void reInit();
 
-    void getDisplayInfo(int &type, char* socType, char* defaultUI);
-    void getFbInfo(int &fb0w, int &fb0h, int &fb0bits, int &fb0trip,
-        int &fb1w, int &fb1h, int &fb1bits, int &fb1trip);
-
     void setLogLevel(int level);
     int dump(char *result);
     void setSourceOutputMode(const char* outputmode);
@@ -442,7 +436,6 @@ private:
     void setBootEnv(const char* key, char* value);
 
     int parseConfigFile();
-    void setTabletDisplay();
     void getBestHdmiMode(char * mode, hdmi_data_t* data);
     void getHighestHdmiMode(char* mode, hdmi_data_t* data);
     void getHighestPriorityMode(char* mode, hdmi_data_t* data);
@@ -465,22 +458,12 @@ private:
     void startBootanimDetectThread();
     static void* HdmiUenventThreadLoop(void* data);
     void setSinkDisplay(bool initState);
-    void setFbParameter(const char* fbdev, struct fb_var_screeninfo var_set);
     int getBootenvInt(const char* key, int defaultVal);
     void dumpCap(const char * path, const char * hint, char *result);
     void dumpCaps(char *result=NULL);
 
     const char* pConfigPath;
     int mDisplayType;
-    int mFb0Width;
-    int mFb0Height;
-    int mFb0FbBits;
-    bool mFb0TripleEnable;//Triple Buffer enable or not
-
-    int mFb1Width;
-    int mFb1Height;
-    int mFb1FbBits;
-    bool mFb1TripleEnable;//Triple Buffer enable or not
     bool mVideoPlaying;
 
     int mDisplayWidth;
diff --git a/services/systemcontrol/ISystemControlService.cpp b/services/systemcontrol/ISystemControlService.cpp
index 7895554..8fe6609 100644
--- a/services/systemcontrol/ISystemControlService.cpp
+++ b/services/systemcontrol/ISystemControlService.cpp
@@ -316,7 +316,7 @@ public:
         int &fb0w, int &fb0h, int &fb0bits, int &fb0trip,
         int &fb1w, int &fb1h, int &fb1bits, int &fb1trip)
     {
-        Parcel data, reply;
+        /*Parcel data, reply;
         data.writeInterfaceToken(ISystemControlService::getInterfaceDescriptor());
         ALOGV("getDroidDisplayInfo\n");
 
@@ -335,7 +335,7 @@ public:
         fb1w = reply.readInt32();
         fb1h = reply.readInt32();
         fb1bits = reply.readInt32();
-        fb1trip = reply.readInt32();
+        fb1trip = reply.readInt32();*/
     }
 
     virtual void loopMountUnmount(int &isMount, String16& path)
@@ -990,7 +990,7 @@ status_t BnISystemControlService::onTransact(
             CHECK_INTERFACE(ISystemControlService, data, reply);
             getDroidDisplayInfo(type, socType, defaultUI, fb0w, fb0h, fb0bits, fb0trip, fb1w, fb1h, fb1bits, fb1trip);
 
-            reply->writeInt32(type);
+            /*reply->writeInt32(type);
             reply->writeString16(socType);
             reply->writeString16(defaultUI);
             reply->writeInt32(fb0w);
@@ -1000,7 +1000,7 @@ status_t BnISystemControlService::onTransact(
             reply->writeInt32(fb1w);
             reply->writeInt32(fb1h);
             reply->writeInt32(fb1bits);
-            reply->writeInt32(fb1trip);
+            reply->writeInt32(fb1trip);*/
             return NO_ERROR;
         }
         case LOOP_MOUNT_UNMOUNT: {
diff --git a/services/systemcontrol/SystemControl.cpp b/services/systemcontrol/SystemControl.cpp
index d53b2a0..6f3d4f1 100644
--- a/services/systemcontrol/SystemControl.cpp
+++ b/services/systemcontrol/SystemControl.cpp
@@ -237,14 +237,14 @@ void SystemControl::setBootEnv(const String16& key, const String16& value) {
 void SystemControl::getDroidDisplayInfo(int &type, String16& socType, String16& defaultUI,
         int &fb0w, int &fb0h, int &fb0bits, int &fb0trip,
         int &fb1w, int &fb1h, int &fb1bits, int &fb1trip) {
-    if (NO_ERROR == permissionCheck()) {
+    /*if (NO_ERROR == permissionCheck()) {
         char bufType[MAX_STR_LEN] = {0};
         char bufUI[MAX_STR_LEN] = {0};
         pDisplayMode->getDisplayInfo(type, bufType, bufUI);
         socType.setTo(String16(bufType));
         defaultUI.setTo(String16(bufUI));
         pDisplayMode->getFbInfo(fb0w, fb0h, fb0bits, fb0trip, fb1w, fb1h, fb1bits, fb1trip);
-    }
+    }*/
 }
 
 void SystemControl::loopMountUnmount(int &isMount, String16& path) {
diff --git a/services/systemcontrol/SystemControl.h b/services/systemcontrol/SystemControl.h
index 2569dbc..26f8834 100644
--- a/services/systemcontrol/SystemControl.h
+++ b/services/systemcontrol/SystemControl.h
@@ -68,7 +68,6 @@ public:
 
     virtual void setBootEnv(const String16& key, const String16& value);
     virtual bool getBootEnv(const String16& key, String16& value);
-
     virtual void getDroidDisplayInfo(int &type, String16& socType, String16& defaultUI,
         int &fb0w, int &fb0h, int &fb0bits, int &fb0trip,
         int &fb1w, int &fb1h, int &fb1bits, int &fb1trip);
diff --git a/services/systemcontrol/SystemControlClient.cpp b/services/systemcontrol/SystemControlClient.cpp
index fd1f4c6..2af9f6a 100644
--- a/services/systemcontrol/SystemControlClient.cpp
+++ b/services/systemcontrol/SystemControlClient.cpp
@@ -197,7 +197,7 @@ void SystemControlClient::getDroidDisplayInfo(int &type, std::string& socType, s
     int &fb0w, int &fb0h, int &fb0bits, int &fb0trip,
     int &fb1w, int &fb1h, int &fb1bits, int &fb1trip) {
 
-    mSysCtrl->getDroidDisplayInfo([&](const Result &ret, const DroidDisplayInfo& info) {
+    /*mSysCtrl->getDroidDisplayInfo([&](const Result &ret, const DroidDisplayInfo& info) {
         if (Result::OK == ret) {
             type = info.type;
             socType = info.socType;
@@ -211,7 +211,7 @@ void SystemControlClient::getDroidDisplayInfo(int &type, std::string& socType, s
             fb1bits = info.fb1bits;
             fb1trip = info.fb1trip;
         }
-    });
+    });*/
 }
 
 void SystemControlClient::loopMountUnmount(int &isMount, const std::string& path)  {
diff --git a/services/systemcontrol/SystemControlClient.h b/services/systemcontrol/SystemControlClient.h
index d1493c9..a553388 100644
--- a/services/systemcontrol/SystemControlClient.h
+++ b/services/systemcontrol/SystemControlClient.h
@@ -117,4 +117,4 @@ public:
 
 }; // namespace android
 
-#endif // ANDROID_SYSTEMCONTROLCLIENT_H
\ No newline at end of file
+#endif // ANDROID_SYSTEMCONTROLCLIENT_H
diff --git a/services/systemcontrol/SystemControlHal.cpp b/services/systemcontrol/SystemControlHal.cpp
index 51bc5cf..251517c 100644
--- a/services/systemcontrol/SystemControlHal.cpp
+++ b/services/systemcontrol/SystemControlHal.cpp
@@ -234,14 +234,14 @@ Return<void> SystemControlHal::setBootEnv(const hidl_string &key, const hidl_str
 Return<void> SystemControlHal::getDroidDisplayInfo(getDroidDisplayInfo_cb _hidl_cb) {
     DroidDisplayInfo info;
 
-    std::string type;
+    /*std::string type;
     std::string ui;
     mSysControl->getDroidDisplayInfo(info.type, type, ui,
         info.fb0w, info.fb0h, info.fb0bits, info.fb0trip,
         info.fb1w, info.fb1h, info.fb1bits, info.fb1trip);
 
     info.socType = type;
-    info.defaultUI = ui;
+    info.defaultUI = ui;*/
     _hidl_cb(Result::OK, info);
     return Void();
 }
diff --git a/services/systemcontrol/SystemControlHal.h b/services/systemcontrol/SystemControlHal.h
index 4dc17ad..b371bef 100644
--- a/services/systemcontrol/SystemControlHal.h
+++ b/services/systemcontrol/SystemControlHal.h
@@ -112,4 +112,4 @@ struct SystemControlHal : public ISystemControl, public SystemControlNotify {
 }  // namespace android
 }  // namespace vendor
 
-#endif  // ANDROID_DROIDLOGIC_SYSTEM_CONTROL_V1_0_SYSTEM_CONTROL_HAL_H
\ No newline at end of file
+#endif  // ANDROID_DROIDLOGIC_SYSTEM_CONTROL_V1_0_SYSTEM_CONTROL_HAL_H
diff --git a/services/systemcontrol/SystemControlService.cpp b/services/systemcontrol/SystemControlService.cpp
index 80be699..16567eb 100644
--- a/services/systemcontrol/SystemControlService.cpp
+++ b/services/systemcontrol/SystemControlService.cpp
@@ -260,12 +260,12 @@ void SystemControlService::getDroidDisplayInfo(int &type, std::string& socType,
         int &fb0w, int &fb0h, int &fb0bits, int &fb0trip,
         int &fb1w, int &fb1h, int &fb1bits, int &fb1trip) {
     if (NO_ERROR == permissionCheck()) {
-        char bufType[MAX_STR_LEN] = {0};
+       /* char bufType[MAX_STR_LEN] = {0};
         char bufUI[MAX_STR_LEN] = {0};
         pDisplayMode->getDisplayInfo(type, bufType, bufUI);
         socType = bufType;
         defaultUI = bufUI;
-        pDisplayMode->getFbInfo(fb0w, fb0h, fb0bits, fb0trip, fb1w, fb1h, fb1bits, fb1trip);
+        pDisplayMode->getFbInfo(fb0w, fb0h, fb0bits, fb0trip, fb1w, fb1h, fb1bits, fb1trip);*/
     }
 }
 
diff --git a/services/systemcontrol/SystemControlService.h b/services/systemcontrol/SystemControlService.h
index 39e8db4..7bdbdc5 100644
--- a/services/systemcontrol/SystemControlService.h
+++ b/services/systemcontrol/SystemControlService.h
@@ -129,4 +129,4 @@ private:
 // ----------------------------------------------------------------------------
 
 } // namespace android
-#endif // ANDROID_SYSTEM_CONTROL_SERVICE_H
\ No newline at end of file
+#endif // ANDROID_SYSTEM_CONTROL_SERVICE_H