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

cmsdk: Re-enable multiple profiles functions. 

Change-Id: I1db0cba6cf107926a25a8e45952813d3c21eb470
This commit is contained in:
Adnan Begovic 2015-11-25 17:27:47 -08:00
parent efb527473e
commit c221959167
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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