cmsdk: Temporary build fixes

Change-Id: I18a1aa9ade95de63fe18eaaeca388b118c8ffe8c

4 files changed, 19 insertions, 14 deletions

diff --git a/cm/lib/main/java/org/cyanogenmod/platform/internal/CMTelephonyManagerService.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/CMTelephonyManagerService.java
index efd0a89..03f4fe6 100644
--- a/cm/lib/main/java/org/cyanogenmod/platform/internal/CMTelephonyManagerService.java
+++ b/cm/lib/main/java/org/cyanogenmod/platform/internal/CMTelephonyManagerService.java
@@ -201,7 +201,7 @@ public class CMTelephonyManagerService extends SystemService {
     }
 
     private boolean isSubActive(int subId) {
-        boolean validSubscriptionId = SubscriptionManager.isValidSubscriptionId(subId);
+        /* boolean validSubscriptionId = SubscriptionManager.isValidSubscriptionId(subId);
 
         if (validSubscriptionId) {
             int simState = SubscriptionManager.getSimStateForSubscriber(subId);
@@ -223,11 +223,12 @@ public class CMTelephonyManagerService extends SystemService {
         } else {
             Log.w(TAG, "Invalid subscription identifier: " + subId);
             return false;
-        }
+        } */
+        return false;
     }
 
     private void setSubState(int subId, boolean state) {
-        if (localLOGD) {
+        /* if (localLOGD) {
             Log.d(TAG, "Setting the subscription " + subId + " to inactive (false) or active (true): " + state);
         }
 
@@ -235,7 +236,7 @@ public class CMTelephonyManagerService extends SystemService {
             SubscriptionManager.activateSubId(subId);
         } else {
             SubscriptionManager.deactivateSubId(subId);
-        }
+        } */
     }
 
     private boolean isDataConnectionSelectedOnSub(int subId) {
@@ -295,7 +296,7 @@ public class CMTelephonyManagerService extends SystemService {
     }
 
     private void setDefaultPhoneSub(int subId) {
-        if (localLOGD) {
+        /* if (localLOGD) {
             Log.d(TAG, "Setting the SIM for phone calls on subscription " + subId);
         }
 
@@ -308,11 +309,11 @@ public class CMTelephonyManagerService extends SystemService {
         } else {
             SubscriptionManager.setVoicePromptEnabled(false);
             subscriptionManager.setDefaultVoiceSubId(subId);
-        }
+        } */
     }
 
     private void setDefaultSmsSub(int subId) {
-        if (localLOGD) {
+        /* if (localLOGD) {
             Log.d(TAG, "Setting the SIM for phone calls on subscription " + subId);
         }
 
@@ -325,7 +326,7 @@ public class CMTelephonyManagerService extends SystemService {
         } else {
             SubscriptionManager.setSMSPromptEnabled(false);
             subscriptionManager.setDefaultSmsSubId(subId);
-        }
+        } */
     }
 
     private void enforceTelephonyReadPermission() {
diff --git a/cm/lib/main/java/org/cyanogenmod/platform/internal/PartnerInterfaceService.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/PartnerInterfaceService.java
index 5cad50f..0f0df53 100644
--- a/cm/lib/main/java/org/cyanogenmod/platform/internal/PartnerInterfaceService.java
+++ b/cm/lib/main/java/org/cyanogenmod/platform/internal/PartnerInterfaceService.java
@@ -219,25 +219,29 @@ public class PartnerInterfaceService extends SystemService {
         Settings.Global.putInt(contentResolver,
                 Settings.Global.ZEN_MODE,
                 zenModeValue);
+        /* 
         try {
             // Setting the exit condition to null signifies "indefinitely"
-            mNotificationManager.setZenModeCondition(null);
+             mNotificationManager.setZenModeCondition(null);
         } catch (RemoteException e) {
             // An error occurred, return false since the
             // condition failed to set.
             Log.e(TAG, "setZenMode() failed for mode: " + mode);
             return false;
         }
+        */ 
         return true;
     }
 
     public String getHotwordPackageNameInternal() {
         String packageName = null;
+        /*
         try {
             packageName = mAudioService.getCurrentHotwordInputPackageName();
         } catch (RemoteException e) {
             Log.e(TAG, "getHotwordPackageName() failed.");
         }
+        */
         return packageName;
     }
 }
diff --git a/cm/lib/main/java/org/cyanogenmod/platform/internal/ProfileTriggerHelper.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/ProfileTriggerHelper.java
index 8ad6098..04b9f40 100644
--- a/cm/lib/main/java/org/cyanogenmod/platform/internal/ProfileTriggerHelper.java
+++ b/cm/lib/main/java/org/cyanogenmod/platform/internal/ProfileTriggerHelper.java
@@ -78,14 +78,14 @@ public class ProfileTriggerHelper extends BroadcastReceiver {
        // mIntentFilter.addAction(AudioManager.A2DP_ROUTE_CHANGED_ACTION);
         updateEnabled();
 
-        mContext.getContentResolver().registerContentObserver(
+        /* mContext.getContentResolver().registerContentObserver(
                 Settings.System.getUriFor(Settings.System.SYSTEM_PROFILES_ENABLED), false,
-                mSettingsObserver);
+                mSettingsObserver); */
     }
 
     public void updateEnabled() {
-        boolean enabled = Settings.System.getInt(mContext.getContentResolver(),
-                Settings.System.SYSTEM_PROFILES_ENABLED, 1) == 1;
+        boolean enabled = false; // Settings.System.getInt(mContext.getContentResolver(),
+                //Settings.System.SYSTEM_PROFILES_ENABLED, 1) == 1;
         if (enabled && !mFilterRegistered) {
             Log.v(TAG, "Enabling");
             mContext.registerReceiver(this, mIntentFilter);
diff --git a/cm/res/Android.mk b/cm/res/Android.mk
index 5cad69f..476e950 100644
--- a/cm/res/Android.mk
+++ b/cm/res/Android.mk
@@ -26,7 +26,7 @@ LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, res)
 # since these resources will be used by many apps.
 
 # 0x3f/one less than app id
-LOCAL_AAPT_FLAGS += -x 63
+LOCAL_AAPT_FLAGS += -x
 
 LOCAL_MODULE_TAGS := optional