ADHOC
/
replicant-vendor_cmsdk
3
0
Fork 0
Code Issues Pull Requests Releases Activity

cmsdk: Temporary build fixes 

Change-Id: I18a1aa9ade95de63fe18eaaeca388b118c8ffe8c
This commit is contained in:
Adnan Begovic 2015-10-09 13:43:51 -07:00
parent a79a53b8ea
commit fe7a368a69
7 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cm/lib/main/java/org/cyanogenmod/platform/internal/CMTelephonyManagerService.java
View File

@ -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() {

6
cm/lib/main/java/org/cyanogenmod/platform/internal/PartnerInterfaceService.java
View File

@ -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;
}
}

8
cm/lib/main/java/org/cyanogenmod/platform/internal/ProfileTriggerHelper.java
View File

@ -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);

2
cm/res/Android.mk
View File

@ -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

2
src/java/cyanogenmod/app/ThemeVersion.java
View File

@ -32,6 +32,7 @@ public class ThemeVersion {
private static final int CM11 = 1;
private static final int CM12_PRE_VERSIONING = 2;
/*
public static int getVersion() {
int version;
try {
@ -203,4 +204,5 @@ public class ThemeVersion {
return new ComponentVersion(id, component, name, minVersion, targetVersion);
}
}
*/
}

6
src/java/cyanogenmod/profiles/ConnectionSettings.java
View File

@ -22,7 +22,7 @@ import android.content.Context;
import android.content.Intent;
import android.location.LocationManager;
import android.net.wifi.WifiManager;
import android.net.wimax.WimaxHelper;
/* import android.net.wimax.WimaxHelper; */
import android.nfc.NfcAdapter;
import android.os.Parcel;
import android.os.Parcelable;
@ -325,12 +325,12 @@ public final class ConnectionSettings implements Parcelable {
}
break;
case PROFILE_CONNECTION_WIMAX:
if (WimaxHelper.isWimaxSupported(context)) {
/* if (WimaxHelper.isWimaxSupported(context)) {
currentState = WimaxHelper.isWimaxEnabled(context);
if (currentState != forcedState) {
WimaxHelper.setWimaxEnabled(context, forcedState);
}
}
} */
break;
case PROFILE_CONNECTION_NFC:
if (nfcAdapter != null) {

8
src/java/cyanogenmod/profiles/LockSettings.java
View File

@ -24,9 +24,9 @@ import android.os.RemoteException;
import android.os.ServiceManager;
import android.util.Log;
import android.view.WindowManagerPolicy;
import android.view.WindowManagerPolicyControl;
/* import android.view.WindowManagerPolicyControl; */
import com.android.internal.policy.IKeyguardService;
import com.android.internal.policy.PolicyManager;
/* import com.android.internal.policy.PolicyManager; */
import cyanogenmod.app.Profile;
import cyanogenmod.os.Build;
@ -110,7 +110,7 @@ public final class LockSettings implements Parcelable {
/** @hide */
public void processOverride(Context context, IKeyguardService keyguard) {
boolean enable;
final DevicePolicyManager devicePolicyManager =
/* final DevicePolicyManager devicePolicyManager =
(DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);
if (devicePolicyManager != null && devicePolicyManager.requireSecureKeyguard()) {
enable = true;
@ -131,7 +131,7 @@ public final class LockSettings implements Parcelable {
keyguard.setKeyguardEnabled(enable);
} catch (RemoteException e) {
Log.w(TAG, "unable to set keyguard enabled state to: " + enable, e);
}
} */
}
/** @hide */