Merge "Remove legacy resources fallback from Connectivity" into sc-dev (0dad48e0) · Commits · e / os / android_frameworks_base

packages/Connectivity/service/src/com/android/server/ConnectivityService.java

+1 −14

Original line number	Original line	Diff line number	Diff line
	@@ -1497,12 +1497,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
	ConnectivitySettingsManager.WIFI_ALWAYS_REQUESTED, false /* defaultValue */);		ConnectivitySettingsManager.WIFI_ALWAYS_REQUESTED, false /* defaultValue */);
	final boolean vehicleAlwaysRequested = mResources.get().getBoolean(		final boolean vehicleAlwaysRequested = mResources.get().getBoolean(
	R.bool.config_vehicleInternalNetworkAlwaysRequested);		R.bool.config_vehicleInternalNetworkAlwaysRequested);
	// TODO (b/183076074): remove legacy fallback after migrating overlays		handleAlwaysOnNetworkRequest(mDefaultVehicleRequest, vehicleAlwaysRequested);
	final boolean legacyAlwaysRequested = mContext.getResources().getBoolean(
	mContext.getResources().getIdentifier(
	"config_vehicleInternalNetworkAlwaysRequested", "bool", "android"));
	handleAlwaysOnNetworkRequest(mDefaultVehicleRequest,
	vehicleAlwaysRequested \|\| legacyAlwaysRequested);
	}		}

	private void registerSettingsCallbacks() {		private void registerSettingsCallbacks() {
	@@ -6823,14 +6818,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
	int mark = mResources.get().getInteger(R.integer.config_networkWakeupPacketMark);		int mark = mResources.get().getInteger(R.integer.config_networkWakeupPacketMark);
	int mask = mResources.get().getInteger(R.integer.config_networkWakeupPacketMask);		int mask = mResources.get().getInteger(R.integer.config_networkWakeupPacketMask);

	// TODO (b/183076074): remove legacy fallback after migrating overlays
	final int legacyMark = mContext.getResources().getInteger(mContext.getResources()
	.getIdentifier("config_networkWakeupPacketMark", "integer", "android"));
	final int legacyMask = mContext.getResources().getInteger(mContext.getResources()
	.getIdentifier("config_networkWakeupPacketMask", "integer", "android"));
	mark = mark == 0 ? legacyMark : mark;
	mask = mask == 0 ? legacyMask : mask;

	// Mask/mark of zero will not detect anything interesting.		// Mask/mark of zero will not detect anything interesting.
	// Don't install rules unless both values are nonzero.		// Don't install rules unless both values are nonzero.
	if (mark == 0 \|\| mask == 0) {		if (mark == 0 \|\| mask == 0) {

packages/Connectivity/service/src/com/android/server/connectivity/KeepaliveTracker.java

+4 −11

Original line number	Original line	Diff line number	Diff line
	@@ -114,18 +114,11 @@ public class KeepaliveTracker {
	mContext = context;		mContext = context;
	mSupportedKeepalives = KeepaliveUtils.getSupportedKeepalives(mContext);		mSupportedKeepalives = KeepaliveUtils.getSupportedKeepalives(mContext);

	// TODO (b/183076074): stop reading legacy resources after migrating overlays
	final int legacyReservedSlots = mContext.getResources().getInteger(
	mContext.getResources().getIdentifier(
	"config_reservedPrivilegedKeepaliveSlots", "integer", "android"));
	final int legacyAllowedSlots = mContext.getResources().getInteger(
	mContext.getResources().getIdentifier(
	"config_allowedUnprivilegedKeepalivePerUid", "integer", "android"));
	final ConnectivityResources res = new ConnectivityResources(mContext);		final ConnectivityResources res = new ConnectivityResources(mContext);
	mReservedPrivilegedSlots = Math.min(legacyReservedSlots, res.get().getInteger(		mReservedPrivilegedSlots = res.get().getInteger(
	R.integer.config_reservedPrivilegedKeepaliveSlots));		R.integer.config_reservedPrivilegedKeepaliveSlots);
	mAllowedUnprivilegedSlotsForUid = Math.min(legacyAllowedSlots, res.get().getInteger(		mAllowedUnprivilegedSlotsForUid = res.get().getInteger(
	R.integer.config_allowedUnprivilegedKeepalivePerUid));		R.integer.config_allowedUnprivilegedKeepalivePerUid);
	}		}

	/**		/**