LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 350bee04: Use heads-up notifications when selecting networks with no Internet

Browse Source 
* commit '350bee0406e73e09de92c87830bcffc28f4169f6':
  Use heads-up notifications when selecting networks with no Internet
This commit is contained in:
Lorenzo Colitti
2015-06-24 09:43:38 +00:00
committed by Android Git Automerger
parent 0aa80efc0f 350bee0406
commit 03308b9db9
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -2006,15 +2006,15 @@ public class ConnectivityService extends IConnectivityManager.Stub
NascentState.NOT_JUST_VALIDATED);
}
if (!visible) {
setProvNotificationVisibleIntent(false, netId, null, 0, null, null);
setProvNotificationVisibleIntent(false, netId, null, 0, null, null, false);
} else {
if (nai == null) {
loge("EVENT_PROVISIONING_NOTIFICATION from unknown NetworkMonitor");
break;
}
setProvNotificationVisibleIntent(true, netId, NotificationType.SIGN_IN,
nai.networkInfo.getType(),nai.networkInfo.getExtraInfo(),
(PendingIntent)msg.obj);
nai.networkInfo.getType(), nai.networkInfo.getExtraInfo(),
(PendingIntent)msg.obj, nai.networkMisc.explicitlySelected);
}
break;
}
@@ -2447,7 +2447,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
PendingIntent pendingIntent = PendingIntent.getActivityAsUser(
mContext, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT, null, UserHandle.CURRENT);
setProvNotificationVisibleIntent(true, nai.network.netId, NotificationType.NO_INTERNET,
nai.networkInfo.getType(), nai.networkInfo.getExtraInfo(), pendingIntent);
nai.networkInfo.getType(), nai.networkInfo.getExtraInfo(), pendingIntent, true);
}
private class InternalHandler extends Handler {
@@ -3240,7 +3240,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
// Concatenate the range of types onto the range of NetIDs.
int id = MAX_NET_ID + 1 + (networkType - ConnectivityManager.TYPE_NONE);
setProvNotificationVisibleIntent(visible, id, NotificationType.SIGN_IN,
networkType, null, pendingIntent);
networkType, null, pendingIntent, false);
}
/**
@@ -3259,11 +3259,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
* we concatenate the range of types with the range of NetIDs.
*/
private void setProvNotificationVisibleIntent(boolean visible, int id,
NotificationType notifyType, int networkType, String extraInfo, PendingIntent intent) {
NotificationType notifyType, int networkType, String extraInfo, PendingIntent intent,
boolean highPriority) {
if (DBG) {
log("setProvNotificationVisibleIntent " + notifyType + " visible=" + visible
+ " networkType=" + getNetworkTypeName(networkType)
+ " extraInfo=" + extraInfo);
+ " extraInfo=" + extraInfo + " highPriority=" + highPriority);
}
Resources r = Resources.getSystem();
@@ -3318,6 +3319,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
.setContentTitle(title)
.setContentText(details)
.setContentIntent(intent)
.setLocalOnly(true)
.setPriority(highPriority ?
Notification.PRIORITY_HIGH :
Notification.PRIORITY_DEFAULT)
.setDefaults(Notification.DEFAULT_ALL)
.setOnlyAlertOnce(true)
.build();
try {