diff options
Diffstat (limited to 'services/java/com')
3 files changed, 8 insertions, 1 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index 6e4aca7..97fb0b0 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -1431,6 +1431,12 @@ private NetworkStateTracker makeWimaxStateTracker() { } mNetTrackers[ConnectivityManager.TYPE_MOBILE].setUserDataEnable(enabled); } + if (mNetTrackers[ConnectivityManager.TYPE_WIMAX] != null) { + if (VDBG) { + log(mNetTrackers[ConnectivityManager.TYPE_WIMAX].toString() + enabled); + } + mNetTrackers[ConnectivityManager.TYPE_WIMAX].setUserDataEnable(enabled); + } } @Override diff --git a/services/java/com/android/server/DevicePolicyManagerService.java b/services/java/com/android/server/DevicePolicyManagerService.java index 47644de..e8ca3ce 100644 --- a/services/java/com/android/server/DevicePolicyManagerService.java +++ b/services/java/com/android/server/DevicePolicyManagerService.java @@ -831,6 +831,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { static void validateQualityConstant(int quality) { switch (quality) { case DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED: + case DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK: case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING: case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC: case DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC: diff --git a/services/java/com/android/server/connectivity/Vpn.java b/services/java/com/android/server/connectivity/Vpn.java index 72cf512..a76e70f 100644 --- a/services/java/com/android/server/connectivity/Vpn.java +++ b/services/java/com/android/server/connectivity/Vpn.java @@ -322,7 +322,7 @@ public class Vpn extends INetworkManagementEventObserver.Stub { .setContentTitle(title) .setContentText(text) .setContentIntent(VpnConfig.getIntentForStatusPanel(mContext, config)) - .setDefaults(Notification.DEFAULT_ALL) + .setDefaults(0) .setOngoing(true) .getNotification(); nm.notify(R.drawable.vpn_connected, notification); |