cmsdk: Re-enable multiple profiles functions.

Change-Id: I1db0cba6cf107926a25a8e45952813d3c21eb470

3 files changed, 7 insertions, 7 deletions

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 054dfed3..804117f4 100644
--- a/cm/lib/main/java/org/cyanogenmod/platform/internal/ProfileTriggerHelper.java
+++ b/cm/lib/main/java/org/cyanogenmod/platform/internal/ProfileTriggerHelper.java
@@ -85,8 +85,8 @@ public class ProfileTriggerHelper extends BroadcastReceiver {
     }
 
     public void updateEnabled() {
-        boolean enabled = false; // Settings.System.getInt(mContext.getContentResolver(),
-                //Settings.System.SYSTEM_PROFILES_ENABLED, 1) == 1;
+        boolean enabled = CMSettings.System.getInt(mContext.getContentResolver(),
+                CMSettings.System.SYSTEM_PROFILES_ENABLED, 1) == 1;
         if (enabled && !mFilterRegistered) {
             Log.v(TAG, "Enabling");
             mContext.registerReceiver(this, mIntentFilter);
diff --git a/src/java/cyanogenmod/profiles/ConnectionSettings.java b/src/java/cyanogenmod/profiles/ConnectionSettings.java
index 093e7b1d..f8f745df 100644
--- a/src/java/cyanogenmod/profiles/ConnectionSettings.java
+++ b/src/java/cyanogenmod/profiles/ConnectionSettings.java
@@ -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) {
diff --git a/src/java/cyanogenmod/profiles/LockSettings.java b/src/java/cyanogenmod/profiles/LockSettings.java
index df4d6c7e..9c86c424 100644
--- a/src/java/cyanogenmod/profiles/LockSettings.java
+++ b/src/java/cyanogenmod/profiles/LockSettings.java
@@ -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 */