summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorIan Pedowitz <ijpedowitz@google.com>2015-09-25 17:04:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-09-25 17:04:14 +0000
commit31fe464d50bcd4360ac004d44d6938eac762d78d (patch)
tree7618b344b83603016844ca184aabba43f79f19b2 /services
parentea9675e7aa11219d426a3c0ab3929ea16a34a4c7 (diff)
parent9795a1d8b9094bd571f653b8de0c531d4466fe46 (diff)
downloadframeworks_base-31fe464d50bcd4360ac004d44d6938eac762d78d.zip
frameworks_base-31fe464d50bcd4360ac004d44d6938eac762d78d.tar.gz
frameworks_base-31fe464d50bcd4360ac004d44d6938eac762d78d.tar.bz2
Merge "Give the DhcpClient alarm broadcasts foreground priority." into mnc-dr-dev
Diffstat (limited to 'services')
-rw-r--r--services/net/java/android/net/dhcp/DhcpClient.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/services/net/java/android/net/dhcp/DhcpClient.java b/services/net/java/android/net/dhcp/DhcpClient.java
index 9ee9cf4..e0d2ac1 100644
--- a/services/net/java/android/net/dhcp/DhcpClient.java
+++ b/services/net/java/android/net/dhcp/DhcpClient.java
@@ -244,8 +244,9 @@ public class DhcpClient extends BaseDhcpStateMachine {
private PendingIntent createStateMachineCommandIntent(final String cmdName, final int cmd) {
String action = DhcpClient.class.getName() + "." + mIfaceName + "." + cmdName;
- Intent intent = new Intent(action, null)
- .addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT);
+ Intent intent = new Intent(action, null).addFlags(
+ Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT |
+ Intent.FLAG_RECEIVER_FOREGROUND);
// TODO: The intent's package covers the whole of the system server, so it's pretty generic.
// Consider adding some sort of token as well.
intent.setPackage(mContext.getPackageName());