diff options
| -rw-r--r-- | opengl/libs/Android.mk | 4 | ||||
| -rw-r--r-- | services/java/com/android/server/WindowManagerService.java | 4 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/cdma/EriManager.java | 34 |
3 files changed, 25 insertions, 17 deletions
diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk index d6c711450ec1..9578452486a9 100644 --- a/opengl/libs/Android.mk +++ b/opengl/libs/Android.mk @@ -32,10 +32,6 @@ ifeq ($(TARGET_BOARD_PLATFORM),msm7k) LOCAL_CFLAGS += -DADRENO130=1 endif -ifeq ($(TARGET_BOARD_PLATFORM),qsd8k) -LOCAL_CFLAGS += -DADRENO130=1 -endif - include $(BUILD_SHARED_LIBRARY) installed_libEGL := $(LOCAL_INSTALLED_MODULE) diff --git a/services/java/com/android/server/WindowManagerService.java b/services/java/com/android/server/WindowManagerService.java index 00636c400ae5..20b01d2d745a 100644 --- a/services/java/com/android/server/WindowManagerService.java +++ b/services/java/com/android/server/WindowManagerService.java @@ -3971,7 +3971,9 @@ public class WindowManagerService extends IWindowManager.Stub != PackageManager.PERMISSION_GRANTED) { throw new SecurityException("Requires DISABLE_KEYGUARD permission"); } - mKeyguardDisabled.acquire(token, tag); + synchronized (mKeyguardDisabled) { + mKeyguardDisabled.acquire(token, tag); + } } public void reenableKeyguard(IBinder token) { diff --git a/telephony/java/com/android/internal/telephony/cdma/EriManager.java b/telephony/java/com/android/internal/telephony/cdma/EriManager.java index 44c6173401b6..9b23cdffb66f 100644 --- a/telephony/java/com/android/internal/telephony/cdma/EriManager.java +++ b/telephony/java/com/android/internal/telephony/cdma/EriManager.java @@ -85,6 +85,7 @@ public final class EriManager { private static final String LOG_TAG = "CDMA"; private static final boolean DBG = true; + private static final boolean VDBG = false; public static final int ERI_FROM_XML = 0; public static final int ERI_FROM_FILE_SYSTEM = 1; @@ -281,11 +282,21 @@ public final class EriManager { } private EriDisplayInformation getEriDisplayInformation(int roamInd, int defRoamInd){ - //int iconIndex = -1; - //int iconMode = -1; - //String iconText = "ERI text"; EriDisplayInformation ret; + // Carrier can use eri.xml to customize any built-in roaming display indications + if (isEriFileLoaded) { + EriInfo eriInfo = getEriInfo(roamInd); + if (eriInfo != null) { + if (DBG) Log.d(LOG_TAG, "ERI roamInd " + roamInd + " found in ERI file"); + ret = new EriDisplayInformation( + eriInfo.mIconIndex, + eriInfo.mIconMode, + eriInfo.mEriText); + return ret; + } + } + switch (roamInd) { // Handling the standard roaming indicator (non-ERI) case EriInfo.ROAMING_INDICATOR_ON: @@ -387,14 +398,14 @@ public final class EriManager { // ERI file NOT loaded if (DBG) Log.d(LOG_TAG, "ERI File not loaded"); if(defRoamInd > 2) { - if (DBG) Log.d(LOG_TAG, "ERI defRoamInd > 2 ...flashing"); + if (VDBG) Log.v(LOG_TAG, "ERI defRoamInd > 2 ...flashing"); ret = new EriDisplayInformation( EriInfo.ROAMING_INDICATOR_FLASH, EriInfo.ROAMING_ICON_MODE_FLASH, mContext.getText(com.android.internal .R.string.roamingText2).toString()); } else { - if (DBG) Log.d(LOG_TAG, "ERI defRoamInd <= 2"); + if (VDBG) Log.v(LOG_TAG, "ERI defRoamInd <= 2"); switch (defRoamInd) { case EriInfo.ROAMING_INDICATOR_ON: ret = new EriDisplayInformation( @@ -426,12 +437,11 @@ public final class EriManager { } } else { // ERI file loaded - if (DBG) Log.d(LOG_TAG, "ERI File loaded"); EriInfo eriInfo = getEriInfo(roamInd); EriInfo defEriInfo = getEriInfo(defRoamInd); if (eriInfo == null) { - if (DBG) { - Log.d(LOG_TAG, "ERI roamInd " + roamInd + if (VDBG) { + Log.v(LOG_TAG, "ERI roamInd " + roamInd + " not found in ERI file ...using defRoamInd " + defRoamInd); } if(defEriInfo == null) { @@ -444,8 +454,8 @@ public final class EriManager { .R.string.roamingText0).toString()); } else { - if (DBG) { - Log.d(LOG_TAG, "ERI defRoamInd " + defRoamInd + " found in ERI file"); + if (VDBG) { + Log.v(LOG_TAG, "ERI defRoamInd " + defRoamInd + " found in ERI file"); } ret = new EriDisplayInformation( defEriInfo.mIconIndex, @@ -453,7 +463,7 @@ public final class EriManager { defEriInfo.mEriText); } } else { - if (DBG) Log.d(LOG_TAG, "ERI roamInd " + roamInd + " found in ERI file"); + if (VDBG) Log.v(LOG_TAG, "ERI roamInd " + roamInd + " found in ERI file"); ret = new EriDisplayInformation( eriInfo.mIconIndex, eriInfo.mIconMode, @@ -462,7 +472,7 @@ public final class EriManager { } break; } - if (DBG) Log.d(LOG_TAG, "Displaying ERI " + ret.toString()); + if (VDBG) Log.v(LOG_TAG, "Displaying ERI " + ret.toString()); return ret; } |