diff --git a/alps/frameworks/base/core/java/android/view/KeyEvent.java b/alps/frameworks/base/core/java/android/view/KeyEvent.java
index 19a9841..af8adba 100644
--- a/alps/frameworks/base/core/java/android/view/KeyEvent.java
+++ b/alps/frameworks/base/core/java/android/view/KeyEvent.java
@@ -1843,7 +1843,10 @@ public class KeyEvent extends InputEvent implements Parcelable {
case KeyEvent.KEYCODE_POWER:
case KeyEvent.KEYCODE_MENU:
case KeyEvent.KEYCODE_SLEEP:
+ case KeyEvent.KEYCODE_CALL:
+ case KeyEvent.KEYCODE_F10:
case KeyEvent.KEYCODE_WAKEUP:
+ case KeyEvent.KEYCODE_CAMERA:
case KeyEvent.KEYCODE_PAIRING:
return true;
}
diff --git a/alps/frameworks/base/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/alps/frameworks/base/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 9189724..bc75a55 100644
--- a/alps/frameworks/base/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/alps/frameworks/base/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -5362,7 +5362,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
case KeyEvent.KEYCODE_MEDIA_RECORD:
case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD:
case KeyEvent.KEYCODE_MEDIA_AUDIO_TRACK:
- case KeyEvent.KEYCODE_CAMERA:
+
return false;
}
return true;
diff --git a/alps/kernel-3.10/drivers/misc/mediatek/keypad/kpd.c b/alps/kernel-3.10/drivers/misc/mediatek/keypad/kpd.c
index 94be1df..e000a5f 100644
--- a/alps/kernel-3.10/drivers/misc/mediatek/keypad/kpd.c
+++ b/alps/kernel-3.10/drivers/misc/mediatek/keypad/kpd.c
@@ -908,14 +908,14 @@ static int kpd_pdrv_remove(struct platform_device *pdev)
static int kpd_pdrv_suspend(struct platform_device *pdev, pm_message_t state)
{
kpd_suspend = true;
-#ifdef MTK_KP_WAKESOURCE
+//#ifdef MTK_KP_WAKESOURCE
if (call_status == 2) {
kpd_print("kpd_early_suspend wake up source enable!! (%d)\n", kpd_suspend);
} else {
- kpd_wakeup_src_setting(0);
+ kpd_wakeup_src_setting(1);
kpd_print("kpd_early_suspend wake up source disable!! (%d)\n", kpd_suspend);
}
-#endif
+//#endif
kpd_disable_backlight();
kpd_print("suspend!! (%d)\n", kpd_suspend);
return 0;
diff --git a/alps/vendor/mediatek/proprietary/packages/apps/FactoryMode-new/src/com/mediatek/factorymode/KeyCode.java b/alps/vendor/mediatek/proprietary/packages/apps/FactoryMode-new/src/com/mediatek/factorymode
index 97cc743..e175343 100644
--- a/alps/vendor/mediatek/proprietary/packages/apps/FactoryMode-new/src/com/mediatek/factorymode/KeyCode.java
+++ b/alps/vendor/mediatek/proprietary/packages/apps/FactoryMode-new/src/com/mediatek/factorymode/KeyCode.java
@@ -191,11 +191,11 @@ public class KeyCode extends Activity implements OnClickListener {
//mListData.remove(R.drawable.record);
mListData.add(R.drawable.sos_w);
break;
- case KeyEvent.KEYCODE_F2:
- if (mKeycode.indexOf("F9") >= 0) {
+ case KeyEvent.KEYCODE_CALL:
+ if (mKeycode.indexOf("CALL") >= 0) {
return false;
}
- mKeycode += "F2\n";
+ mKeycode += "CALL\n";
for (int i = 0; i < mListData.size(); i++) {
if (mListData.get(i) == R.drawable.ptt) {
mListData.remove(i);
index 19a9841..af8adba 100644
--- a/alps/frameworks/base/core/java/android/view/KeyEvent.java
+++ b/alps/frameworks/base/core/java/android/view/KeyEvent.java
@@ -1843,7 +1843,10 @@ public class KeyEvent extends InputEvent implements Parcelable {
case KeyEvent.KEYCODE_POWER:
case KeyEvent.KEYCODE_MENU:
case KeyEvent.KEYCODE_SLEEP:
+ case KeyEvent.KEYCODE_CALL:
+ case KeyEvent.KEYCODE_F10:
case KeyEvent.KEYCODE_WAKEUP:
+ case KeyEvent.KEYCODE_CAMERA:
case KeyEvent.KEYCODE_PAIRING:
return true;
}
diff --git a/alps/frameworks/base/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/alps/frameworks/base/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 9189724..bc75a55 100644
--- a/alps/frameworks/base/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/alps/frameworks/base/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -5362,7 +5362,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
case KeyEvent.KEYCODE_MEDIA_RECORD:
case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD:
case KeyEvent.KEYCODE_MEDIA_AUDIO_TRACK:
- case KeyEvent.KEYCODE_CAMERA:
+
return false;
}
return true;
diff --git a/alps/kernel-3.10/drivers/misc/mediatek/keypad/kpd.c b/alps/kernel-3.10/drivers/misc/mediatek/keypad/kpd.c
index 94be1df..e000a5f 100644
--- a/alps/kernel-3.10/drivers/misc/mediatek/keypad/kpd.c
+++ b/alps/kernel-3.10/drivers/misc/mediatek/keypad/kpd.c
@@ -908,14 +908,14 @@ static int kpd_pdrv_remove(struct platform_device *pdev)
static int kpd_pdrv_suspend(struct platform_device *pdev, pm_message_t state)
{
kpd_suspend = true;
-#ifdef MTK_KP_WAKESOURCE
+//#ifdef MTK_KP_WAKESOURCE
if (call_status == 2) {
kpd_print("kpd_early_suspend wake up source enable!! (%d)\n", kpd_suspend);
} else {
- kpd_wakeup_src_setting(0);
+ kpd_wakeup_src_setting(1);
kpd_print("kpd_early_suspend wake up source disable!! (%d)\n", kpd_suspend);
}
-#endif
+//#endif
kpd_disable_backlight();
kpd_print("suspend!! (%d)\n", kpd_suspend);
return 0;
diff --git a/alps/vendor/mediatek/proprietary/packages/apps/FactoryMode-new/src/com/mediatek/factorymode/KeyCode.java b/alps/vendor/mediatek/proprietary/packages/apps/FactoryMode-new/src/com/mediatek/factorymode
index 97cc743..e175343 100644
--- a/alps/vendor/mediatek/proprietary/packages/apps/FactoryMode-new/src/com/mediatek/factorymode/KeyCode.java
+++ b/alps/vendor/mediatek/proprietary/packages/apps/FactoryMode-new/src/com/mediatek/factorymode/KeyCode.java
@@ -191,11 +191,11 @@ public class KeyCode extends Activity implements OnClickListener {
//mListData.remove(R.drawable.record);
mListData.add(R.drawable.sos_w);
break;
- case KeyEvent.KEYCODE_F2:
- if (mKeycode.indexOf("F9") >= 0) {
+ case KeyEvent.KEYCODE_CALL:
+ if (mKeycode.indexOf("CALL") >= 0) {
return false;
}
- mKeycode += "F2\n";
+ mKeycode += "CALL\n";
for (int i = 0; i < mListData.size(); i++) {
if (mListData.get(i) == R.drawable.ptt) {
mListData.remove(i);