WifiNetworkConfigBuilder: Pass package name (6c3d4167) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/WifiNetworkAgentSpecifier.java

+27 −4

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,7 @@ import android.net.NetworkRequest;
	import android.net.NetworkSpecifier;		import android.net.NetworkSpecifier;
	import android.os.Parcel;		import android.os.Parcel;
	import android.os.Parcelable;		import android.os.Parcelable;
			import android.text.TextUtils;

	import java.util.Objects;		import java.util.Objects;

	@@ -50,12 +51,24 @@ public final class WifiNetworkAgentSpecifier extends NetworkSpecifier implements
	*/		*/
	private final int mOriginalRequestorUid;		private final int mOriginalRequestorUid;

			/**
			* The package name of the app that requested a specific wifi network using
			* {@link WifiNetworkSpecifier}.
			*
			* Will only be filled when the device connects to a wifi network as a result of a
			* {@link NetworkRequest} with {@link WifiNetworkSpecifier}. Will be set to null if the device
			* auto-connected to a wifi network.
			*/
			private final String mOriginalRequestorPackageName;

	public WifiNetworkAgentSpecifier(@NonNull WifiConfiguration wifiConfiguration,		public WifiNetworkAgentSpecifier(@NonNull WifiConfiguration wifiConfiguration,
	int originalRequestorUid) {		int originalRequestorUid,
			@Nullable String originalRequestorPackageName) {
	checkNotNull(wifiConfiguration);		checkNotNull(wifiConfiguration);

	mWifiConfiguration = wifiConfiguration;		mWifiConfiguration = wifiConfiguration;
	mOriginalRequestorUid = originalRequestorUid;		mOriginalRequestorUid = originalRequestorUid;
			mOriginalRequestorPackageName = originalRequestorPackageName;
	}		}

	/**		/**
	@@ -67,7 +80,9 @@ public final class WifiNetworkAgentSpecifier extends NetworkSpecifier implements
	public WifiNetworkAgentSpecifier createFromParcel(@NonNull Parcel in) {		public WifiNetworkAgentSpecifier createFromParcel(@NonNull Parcel in) {
	WifiConfiguration wifiConfiguration = in.readParcelable(null);		WifiConfiguration wifiConfiguration = in.readParcelable(null);
	int originalRequestorUid = in.readInt();		int originalRequestorUid = in.readInt();
	return new WifiNetworkAgentSpecifier(wifiConfiguration, originalRequestorUid);		String originalRequestorPackageName = in.readString();
			return new WifiNetworkAgentSpecifier(
			wifiConfiguration, originalRequestorUid, originalRequestorPackageName);
	}		}

	@Override		@Override
	@@ -85,6 +100,7 @@ public final class WifiNetworkAgentSpecifier extends NetworkSpecifier implements
	public void writeToParcel(@NonNull Parcel dest, int flags) {		public void writeToParcel(@NonNull Parcel dest, int flags) {
	dest.writeParcelable(mWifiConfiguration, flags);		dest.writeParcelable(mWifiConfiguration, flags);
	dest.writeInt(mOriginalRequestorUid);		dest.writeInt(mOriginalRequestorUid);
			dest.writeString(mOriginalRequestorPackageName);
	}		}

	@Override		@Override
	@@ -137,6 +153,9 @@ public final class WifiNetworkAgentSpecifier extends NetworkSpecifier implements
	if (ns.requestorUid != this.mOriginalRequestorUid) {		if (ns.requestorUid != this.mOriginalRequestorUid) {
	return false;		return false;
	}		}
			if (!TextUtils.equals(ns.requestorPackageName, this.mOriginalRequestorPackageName)) {
			return false;
			}
	return true;		return true;
	}		}

	@@ -146,7 +165,8 @@ public final class WifiNetworkAgentSpecifier extends NetworkSpecifier implements
	mWifiConfiguration.SSID,		mWifiConfiguration.SSID,
	mWifiConfiguration.BSSID,		mWifiConfiguration.BSSID,
	mWifiConfiguration.allowedKeyManagement,		mWifiConfiguration.allowedKeyManagement,
	mOriginalRequestorUid);		mOriginalRequestorUid,
			mOriginalRequestorPackageName);
	}		}

	@Override		@Override
	@@ -162,7 +182,9 @@ public final class WifiNetworkAgentSpecifier extends NetworkSpecifier implements
	&& Objects.equals(this.mWifiConfiguration.BSSID, lhs.mWifiConfiguration.BSSID)		&& Objects.equals(this.mWifiConfiguration.BSSID, lhs.mWifiConfiguration.BSSID)
	&& Objects.equals(this.mWifiConfiguration.allowedKeyManagement,		&& Objects.equals(this.mWifiConfiguration.allowedKeyManagement,
	lhs.mWifiConfiguration.allowedKeyManagement)		lhs.mWifiConfiguration.allowedKeyManagement)
	&& mOriginalRequestorUid == lhs.mOriginalRequestorUid;		&& mOriginalRequestorUid == lhs.mOriginalRequestorUid
			&& TextUtils.equals(mOriginalRequestorPackageName,
			lhs.mOriginalRequestorPackageName);
	}		}

	@Override		@Override
	@@ -172,6 +194,7 @@ public final class WifiNetworkAgentSpecifier extends NetworkSpecifier implements
	.append(", SSID=").append(mWifiConfiguration.SSID)		.append(", SSID=").append(mWifiConfiguration.SSID)
	.append(", BSSID=").append(mWifiConfiguration.BSSID)		.append(", BSSID=").append(mWifiConfiguration.BSSID)
	.append(", mOriginalRequestorUid=").append(mOriginalRequestorUid)		.append(", mOriginalRequestorUid=").append(mOriginalRequestorUid)
			.append(", mOriginalRequestorPackageName=").append(mOriginalRequestorPackageName)
	.append("]");		.append("]");
	return sb.toString();		return sb.toString();
	}		}

wifi/java/android/net/wifi/WifiNetworkConfigBuilder.java

+5 −2

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,7 @@ import static com.android.internal.util.Preconditions.checkNotNull;

	import android.annotation.NonNull;		import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
			import android.app.ActivityThread;
	import android.net.MacAddress;		import android.net.MacAddress;
	import android.net.NetworkRequest;		import android.net.NetworkRequest;
	import android.net.NetworkSpecifier;		import android.net.NetworkSpecifier;
	@@ -586,7 +587,8 @@ public class WifiNetworkConfigBuilder {
	mSsidPatternMatcher,		mSsidPatternMatcher,
	mBssidPatternMatcher,		mBssidPatternMatcher,
	buildWifiConfiguration(),		buildWifiConfiguration(),
	Process.myUid());		Process.myUid(),
			ActivityThread.currentApplication().getApplicationContext().getOpPackageName());
	}		}

	/**		/**
	@@ -648,7 +650,8 @@ public class WifiNetworkConfigBuilder {
	buildWifiConfiguration(),		buildWifiConfiguration(),
	mIsAppInteractionRequired,		mIsAppInteractionRequired,
	mIsUserInteractionRequired,		mIsUserInteractionRequired,
	Process.myUid());		Process.myUid(),
			ActivityThread.currentApplication().getApplicationContext().getOpPackageName());

	}		}
	}		}

wifi/java/android/net/wifi/WifiNetworkSpecifier.java

+16 −4

Original line number	Original line	Diff line number	Diff line
	@@ -25,6 +25,7 @@ import android.net.NetworkSpecifier;
	import android.os.Parcel;		import android.os.Parcel;
	import android.os.Parcelable;		import android.os.Parcelable;
	import android.os.PatternMatcher;		import android.os.PatternMatcher;
			import android.text.TextUtils;
	import android.util.Pair;		import android.util.Pair;

	import java.util.Objects;		import java.util.Objects;
	@@ -63,18 +64,25 @@ public final class WifiNetworkSpecifier extends NetworkSpecifier implements Parc
	*/		*/
	public final int requestorUid;		public final int requestorUid;

			/**
			* The package name of the app initializing this network specifier.
			*/
			public final String requestorPackageName;

	public WifiNetworkSpecifier(@NonNull PatternMatcher ssidPatternMatcher,		public WifiNetworkSpecifier(@NonNull PatternMatcher ssidPatternMatcher,
	@NonNull Pair<MacAddress, MacAddress> bssidPatternMatcher,		@NonNull Pair<MacAddress, MacAddress> bssidPatternMatcher,
	@NonNull WifiConfiguration wifiConfiguration,		@NonNull WifiConfiguration wifiConfiguration,
	int requestorUid) {		int requestorUid, @NonNull String requestorPackageName) {
	checkNotNull(ssidPatternMatcher);		checkNotNull(ssidPatternMatcher);
	checkNotNull(bssidPatternMatcher);		checkNotNull(bssidPatternMatcher);
	checkNotNull(wifiConfiguration);		checkNotNull(wifiConfiguration);
			checkNotNull(requestorPackageName);

	this.ssidPatternMatcher = ssidPatternMatcher;		this.ssidPatternMatcher = ssidPatternMatcher;
	this.bssidPatternMatcher = bssidPatternMatcher;		this.bssidPatternMatcher = bssidPatternMatcher;
	this.wifiConfiguration = wifiConfiguration;		this.wifiConfiguration = wifiConfiguration;
	this.requestorUid = requestorUid;		this.requestorUid = requestorUid;
			this.requestorPackageName = requestorPackageName;
	}		}

	public static final Creator<WifiNetworkSpecifier> CREATOR =		public static final Creator<WifiNetworkSpecifier> CREATOR =
	@@ -88,8 +96,9 @@ public final class WifiNetworkSpecifier extends NetworkSpecifier implements Parc
	Pair.create(baseAddress, mask);		Pair.create(baseAddress, mask);
	WifiConfiguration wifiConfiguration = in.readParcelable(null);		WifiConfiguration wifiConfiguration = in.readParcelable(null);
	int requestorUid = in.readInt();		int requestorUid = in.readInt();
			String requestorPackageName = in.readString();
	return new WifiNetworkSpecifier(ssidPatternMatcher, bssidPatternMatcher,		return new WifiNetworkSpecifier(ssidPatternMatcher, bssidPatternMatcher,
	wifiConfiguration, requestorUid);		wifiConfiguration, requestorUid, requestorPackageName);
	}		}

	@Override		@Override
	@@ -110,6 +119,7 @@ public final class WifiNetworkSpecifier extends NetworkSpecifier implements Parc
	dest.writeParcelable(bssidPatternMatcher.second, flags);		dest.writeParcelable(bssidPatternMatcher.second, flags);
	dest.writeParcelable(wifiConfiguration, flags);		dest.writeParcelable(wifiConfiguration, flags);
	dest.writeInt(requestorUid);		dest.writeInt(requestorUid);
			dest.writeString(requestorPackageName);
	}		}

	@Override		@Override
	@@ -136,7 +146,7 @@ public final class WifiNetworkSpecifier extends NetworkSpecifier implements Parc
	ssidPatternMatcher.getType(),		ssidPatternMatcher.getType(),
	bssidPatternMatcher,		bssidPatternMatcher,
	wifiConfiguration.allowedKeyManagement,		wifiConfiguration.allowedKeyManagement,
	requestorUid);		requestorUid, requestorPackageName);
	}		}

	@Override		@Override
	@@ -156,7 +166,8 @@ public final class WifiNetworkSpecifier extends NetworkSpecifier implements Parc
	lhs.bssidPatternMatcher)		lhs.bssidPatternMatcher)
	&& Objects.equals(this.wifiConfiguration.allowedKeyManagement,		&& Objects.equals(this.wifiConfiguration.allowedKeyManagement,
	lhs.wifiConfiguration.allowedKeyManagement)		lhs.wifiConfiguration.allowedKeyManagement)
	&& requestorUid == lhs.requestorUid;		&& requestorUid == lhs.requestorUid
			&& TextUtils.equals(requestorPackageName, lhs.requestorPackageName);
	}		}

	@Override		@Override
	@@ -168,6 +179,7 @@ public final class WifiNetworkSpecifier extends NetworkSpecifier implements Parc
	.append(", SSID=").append(wifiConfiguration.SSID)		.append(", SSID=").append(wifiConfiguration.SSID)
	.append(", BSSID=").append(wifiConfiguration.BSSID)		.append(", BSSID=").append(wifiConfiguration.BSSID)
	.append(", requestorUid=").append(requestorUid)		.append(", requestorUid=").append(requestorUid)
			.append(", requestorPackageName=").append(requestorPackageName)
	.append("]")		.append("]")
	.toString();		.toString();
	}		}

wifi/java/android/net/wifi/WifiNetworkSuggestion.java

+19 −5

Original line number	Original line	Diff line number	Diff line
	@@ -18,8 +18,10 @@ package android.net.wifi;

	import static com.android.internal.util.Preconditions.checkNotNull;		import static com.android.internal.util.Preconditions.checkNotNull;

			import android.annotation.NonNull;
	import android.os.Parcel;		import android.os.Parcel;
	import android.os.Parcelable;		import android.os.Parcelable;
			import android.text.TextUtils;

	import java.util.List;		import java.util.List;
	import java.util.Objects;		import java.util.Objects;
	@@ -58,17 +60,25 @@ public final class WifiNetworkSuggestion implements Parcelable {
	*/		*/
	public final int suggestorUid;		public final int suggestorUid;

			/**
			* The package name of the process initializing this network suggestion.
			* @hide
			*/
			public final String suggestorPackageName;

	/** @hide */		/** @hide */
	public WifiNetworkSuggestion(WifiConfiguration wifiConfiguration,		public WifiNetworkSuggestion(@NonNull WifiConfiguration wifiConfiguration,
	boolean isAppInteractionRequired,		boolean isAppInteractionRequired,
	boolean isUserInteractionRequired,		boolean isUserInteractionRequired,
	int suggestorUid) {		int suggestorUid, @NonNull String suggestorPackageName) {
	checkNotNull(wifiConfiguration);		checkNotNull(wifiConfiguration);
			checkNotNull(suggestorPackageName);

	this.wifiConfiguration = wifiConfiguration;		this.wifiConfiguration = wifiConfiguration;
	this.isAppInteractionRequired = isAppInteractionRequired;		this.isAppInteractionRequired = isAppInteractionRequired;
	this.isUserInteractionRequired = isUserInteractionRequired;		this.isUserInteractionRequired = isUserInteractionRequired;
	this.suggestorUid = suggestorUid;		this.suggestorUid = suggestorUid;
			this.suggestorPackageName = suggestorPackageName;
	}		}

	public static final Creator<WifiNetworkSuggestion> CREATOR =		public static final Creator<WifiNetworkSuggestion> CREATOR =
	@@ -79,7 +89,8 @@ public final class WifiNetworkSuggestion implements Parcelable {
	in.readParcelable(null), // wifiConfiguration		in.readParcelable(null), // wifiConfiguration
	in.readBoolean(), // isAppInteractionRequired		in.readBoolean(), // isAppInteractionRequired
	in.readBoolean(), // isUserInteractionRequired		in.readBoolean(), // isUserInteractionRequired
	in.readInt() // suggestorUid		in.readInt(), // suggestorUid
			in.readString() // suggestorPackageName
	);		);
	}		}

	@@ -100,12 +111,13 @@ public final class WifiNetworkSuggestion implements Parcelable {
	dest.writeBoolean(isAppInteractionRequired);		dest.writeBoolean(isAppInteractionRequired);
	dest.writeBoolean(isUserInteractionRequired);		dest.writeBoolean(isUserInteractionRequired);
	dest.writeInt(suggestorUid);		dest.writeInt(suggestorUid);
			dest.writeString(suggestorPackageName);
	}		}

	@Override		@Override
	public int hashCode() {		public int hashCode() {
	return Objects.hash(wifiConfiguration.SSID, wifiConfiguration.BSSID,		return Objects.hash(wifiConfiguration.SSID, wifiConfiguration.BSSID,
	wifiConfiguration.allowedKeyManagement, suggestorUid);		wifiConfiguration.allowedKeyManagement, suggestorUid, suggestorPackageName);
	}		}

	/**		/**
	@@ -124,7 +136,8 @@ public final class WifiNetworkSuggestion implements Parcelable {
	&& Objects.equals(this.wifiConfiguration.BSSID, lhs.wifiConfiguration.BSSID)		&& Objects.equals(this.wifiConfiguration.BSSID, lhs.wifiConfiguration.BSSID)
	&& Objects.equals(this.wifiConfiguration.allowedKeyManagement,		&& Objects.equals(this.wifiConfiguration.allowedKeyManagement,
	lhs.wifiConfiguration.allowedKeyManagement)		lhs.wifiConfiguration.allowedKeyManagement)
	&& suggestorUid == lhs.suggestorUid;		&& suggestorUid == lhs.suggestorUid
			&& TextUtils.equals(suggestorPackageName, lhs.suggestorPackageName);
	}		}

	@Override		@Override
	@@ -135,6 +148,7 @@ public final class WifiNetworkSuggestion implements Parcelable {
	.append(", isAppInteractionRequired=").append(isAppInteractionRequired)		.append(", isAppInteractionRequired=").append(isAppInteractionRequired)
	.append(", isUserInteractionRequired=").append(isUserInteractionRequired)		.append(", isUserInteractionRequired=").append(isUserInteractionRequired)
	.append(", suggestorUid=").append(suggestorUid)		.append(", suggestorUid=").append(suggestorUid)
			.append(", suggestorPackageName=").append(suggestorPackageName)
	.append("]");		.append("]");
	return sb.toString();		return sb.toString();
	}		}

wifi/tests/src/android/net/wifi/WifiNetworkAgentSpecifierTest.java

+21 −18

Original line number	Original line	Diff line number	Diff line
	@@ -38,6 +38,8 @@ import org.junit.Test;
	public class WifiNetworkAgentSpecifierTest {		public class WifiNetworkAgentSpecifierTest {
	private static final int TEST_UID = 5;		private static final int TEST_UID = 5;
	private static final int TEST_UID_1 = 8;		private static final int TEST_UID_1 = 8;
			private static final String TEST_PACKAGE = "com.test";
			private static final String TEST_PACKAGE_1 = "com.test.1";
	private static final String TEST_SSID = "Test123";		private static final String TEST_SSID = "Test123";
	private static final String TEST_SSID_PATTERN = "Test";		private static final String TEST_SSID_PATTERN = "Test";
	private static final String TEST_SSID_1 = "456test";		private static final String TEST_SSID_1 = "456test";
	@@ -104,14 +106,14 @@ public class WifiNetworkAgentSpecifierTest {
	WifiNetworkAgentSpecifier specifier1 =		WifiNetworkAgentSpecifier specifier1 =
	new WifiNetworkAgentSpecifier(		new WifiNetworkAgentSpecifier(
	wifiConfiguration1,		wifiConfiguration1,
	TEST_UID);		TEST_UID, TEST_PACKAGE);

	WifiConfiguration wifiConfiguration2 = new WifiConfiguration(wifiConfiguration1);		WifiConfiguration wifiConfiguration2 = new WifiConfiguration(wifiConfiguration1);
	wifiConfiguration2.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE);		wifiConfiguration2.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE);
	WifiNetworkAgentSpecifier specifier2 =		WifiNetworkAgentSpecifier specifier2 =
	new WifiNetworkAgentSpecifier(		new WifiNetworkAgentSpecifier(
	wifiConfiguration2,		wifiConfiguration2,
	TEST_UID);		TEST_UID, TEST_PACKAGE);

	assertFalse(specifier2.equals(specifier1));		assertFalse(specifier2.equals(specifier1));
	}		}
	@@ -128,14 +130,14 @@ public class WifiNetworkAgentSpecifierTest {
	WifiNetworkAgentSpecifier specifier1 =		WifiNetworkAgentSpecifier specifier1 =
	new WifiNetworkAgentSpecifier(		new WifiNetworkAgentSpecifier(
	wifiConfiguration1,		wifiConfiguration1,
	TEST_UID);		TEST_UID, TEST_PACKAGE);

	WifiConfiguration wifiConfiguration2 = new WifiConfiguration(wifiConfiguration1);		WifiConfiguration wifiConfiguration2 = new WifiConfiguration(wifiConfiguration1);
	wifiConfiguration2.SSID = TEST_SSID_1;		wifiConfiguration2.SSID = TEST_SSID_1;
	WifiNetworkAgentSpecifier specifier2 =		WifiNetworkAgentSpecifier specifier2 =
	new WifiNetworkAgentSpecifier(		new WifiNetworkAgentSpecifier(
	wifiConfiguration2,		wifiConfiguration2,
	TEST_UID);		TEST_UID, TEST_PACKAGE);

	assertFalse(specifier2.equals(specifier1));		assertFalse(specifier2.equals(specifier1));
	}		}
	@@ -152,14 +154,14 @@ public class WifiNetworkAgentSpecifierTest {
	WifiNetworkAgentSpecifier specifier1 =		WifiNetworkAgentSpecifier specifier1 =
	new WifiNetworkAgentSpecifier(		new WifiNetworkAgentSpecifier(
	wifiConfiguration1,		wifiConfiguration1,
	TEST_UID);		TEST_UID, TEST_PACKAGE);

	WifiConfiguration wifiConfiguration2 = new WifiConfiguration(wifiConfiguration1);		WifiConfiguration wifiConfiguration2 = new WifiConfiguration(wifiConfiguration1);
	wifiConfiguration2.BSSID = TEST_BSSID_1;		wifiConfiguration2.BSSID = TEST_BSSID_1;
	WifiNetworkAgentSpecifier specifier2 =		WifiNetworkAgentSpecifier specifier2 =
	new WifiNetworkAgentSpecifier(		new WifiNetworkAgentSpecifier(
	wifiConfiguration2,		wifiConfiguration2,
	TEST_UID);		TEST_UID, TEST_PACKAGE);

	assertFalse(specifier2.equals(specifier1));		assertFalse(specifier2.equals(specifier1));
	}		}
	@@ -214,7 +216,7 @@ public class WifiNetworkAgentSpecifierTest {
	ssidPattern,		ssidPattern,
	bssidPattern,		bssidPattern,
	wificonfigurationNetworkSpecifier,		wificonfigurationNetworkSpecifier,
	TEST_UID);		TEST_UID, TEST_PACKAGE);

	assertTrue(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier));		assertTrue(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier));
	assertTrue(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier));		assertTrue(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier));
	@@ -243,7 +245,7 @@ public class WifiNetworkAgentSpecifierTest {
	ssidPattern,		ssidPattern,
	bssidPattern,		bssidPattern,
	wificonfigurationNetworkSpecifier,		wificonfigurationNetworkSpecifier,
	TEST_UID);		TEST_UID, TEST_PACKAGE);

	assertTrue(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier));		assertTrue(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier));
	assertTrue(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier));		assertTrue(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier));
	@@ -272,7 +274,7 @@ public class WifiNetworkAgentSpecifierTest {
	ssidPattern,		ssidPattern,
	bssidPattern,		bssidPattern,
	wificonfigurationNetworkSpecifier,		wificonfigurationNetworkSpecifier,
	TEST_UID);		TEST_UID, TEST_PACKAGE);

	assertTrue(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier));		assertTrue(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier));
	assertTrue(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier));		assertTrue(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier));
	@@ -292,7 +294,7 @@ public class WifiNetworkAgentSpecifierTest {
	WifiNetworkAgentSpecifier wifiNetworkAgentSpecifier =		WifiNetworkAgentSpecifier wifiNetworkAgentSpecifier =
	new WifiNetworkAgentSpecifier(		new WifiNetworkAgentSpecifier(
	wifiConfigurationNetworkAgent,		wifiConfigurationNetworkAgent,
	TEST_UID);		TEST_UID, TEST_PACKAGE);

	PatternMatcher ssidPattern =		PatternMatcher ssidPattern =
	new PatternMatcher(TEST_SSID_PATTERN, PatternMatcher.PATTERN_PREFIX);		new PatternMatcher(TEST_SSID_PATTERN, PatternMatcher.PATTERN_PREFIX);
	@@ -305,7 +307,7 @@ public class WifiNetworkAgentSpecifierTest {
	ssidPattern,		ssidPattern,
	bssidPattern,		bssidPattern,
	wificonfigurationNetworkSpecifier,		wificonfigurationNetworkSpecifier,
	TEST_UID);		TEST_UID, TEST_PACKAGE);

	assertFalse(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier));		assertFalse(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier));
	assertFalse(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier));		assertFalse(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier));
	@@ -325,7 +327,7 @@ public class WifiNetworkAgentSpecifierTest {
	WifiNetworkAgentSpecifier wifiNetworkAgentSpecifier =		WifiNetworkAgentSpecifier wifiNetworkAgentSpecifier =
	new WifiNetworkAgentSpecifier(		new WifiNetworkAgentSpecifier(
	wifiConfigurationNetworkAgent,		wifiConfigurationNetworkAgent,
	TEST_UID);		TEST_UID, TEST_PACKAGE);

	PatternMatcher ssidPattern =		PatternMatcher ssidPattern =
	new PatternMatcher(".*", PatternMatcher.PATTERN_SIMPLE_GLOB);		new PatternMatcher(".*", PatternMatcher.PATTERN_SIMPLE_GLOB);
	@@ -339,7 +341,7 @@ public class WifiNetworkAgentSpecifierTest {
	ssidPattern,		ssidPattern,
	bssidPattern,		bssidPattern,
	wificonfigurationNetworkSpecifier,		wificonfigurationNetworkSpecifier,
	TEST_UID);		TEST_UID, TEST_PACKAGE);

	assertFalse(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier));		assertFalse(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier));
	assertFalse(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier));		assertFalse(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier));
	@@ -359,7 +361,7 @@ public class WifiNetworkAgentSpecifierTest {
	WifiNetworkAgentSpecifier wifiNetworkAgentSpecifier =		WifiNetworkAgentSpecifier wifiNetworkAgentSpecifier =
	new WifiNetworkAgentSpecifier(		new WifiNetworkAgentSpecifier(
	wifiConfigurationNetworkAgent,		wifiConfigurationNetworkAgent,
	TEST_UID);		TEST_UID, TEST_PACKAGE);

	PatternMatcher ssidPattern =		PatternMatcher ssidPattern =
	new PatternMatcher(TEST_SSID_PATTERN, PatternMatcher.PATTERN_PREFIX);		new PatternMatcher(TEST_SSID_PATTERN, PatternMatcher.PATTERN_PREFIX);
	@@ -373,7 +375,7 @@ public class WifiNetworkAgentSpecifierTest {
	ssidPattern,		ssidPattern,
	bssidPattern,		bssidPattern,
	wificonfigurationNetworkSpecifier,		wificonfigurationNetworkSpecifier,
	TEST_UID);		TEST_UID, TEST_PACKAGE);

	assertFalse(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier));		assertFalse(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier));
	assertFalse(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier));		assertFalse(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier));
	@@ -401,7 +403,7 @@ public class WifiNetworkAgentSpecifierTest {
	ssidPattern,		ssidPattern,
	bssidPattern,		bssidPattern,
	wificonfigurationNetworkSpecifier,		wificonfigurationNetworkSpecifier,
	TEST_UID);		TEST_UID, TEST_PACKAGE);

	assertFalse(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier));		assertFalse(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier));
	assertFalse(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier));		assertFalse(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier));
	@@ -430,7 +432,7 @@ public class WifiNetworkAgentSpecifierTest {
	ssidPattern,		ssidPattern,
	bssidPattern,		bssidPattern,
	wificonfigurationNetworkSpecifier,		wificonfigurationNetworkSpecifier,
	TEST_UID_1);		TEST_UID_1, TEST_PACKAGE_1);

	assertFalse(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier));		assertFalse(wifiNetworkSpecifier.satisfiedBy(wifiNetworkAgentSpecifier));
	assertFalse(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier));		assertFalse(wifiNetworkAgentSpecifier.satisfiedBy(wifiNetworkSpecifier));
	@@ -446,7 +448,8 @@ public class WifiNetworkAgentSpecifierTest {
	}		}

	private WifiNetworkAgentSpecifier createDefaultNetworkAgentSpecifier() {		private WifiNetworkAgentSpecifier createDefaultNetworkAgentSpecifier() {
	return new WifiNetworkAgentSpecifier(createDefaultWifiConfiguration(), TEST_UID);		return new WifiNetworkAgentSpecifier(createDefaultWifiConfiguration(), TEST_UID,
			TEST_PACKAGE);
	}		}

	}		}