Merge branch 'epic6-s-icon-redesign' into 'v1-s' (7eb5a33d) · Commits · e / os / android_frameworks_base

core/res/res/values/config.xml

+0 −6

Original line number	Diff line number	Diff line
		@@ -5317,10 +5317,4 @@
		<string-array name="config_serviceStateLocationAllowedPackages">
		<item>"com.android.phone"</item>
		</string-array>

		<!-- List of packages which requires permissions reset after update. -->
		<string-array name="config_network_policy_manager_replacing_packages">
		<!-- <item>packageName</item> -->
		<item>com.android.vending</item>
		</string-array>
		</resources>

core/res/res/values/symbols.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -4495,5 +4495,4 @@
		<java-symbol type="array" name="config_builtInDisplayIsRoundArray" />
		<java-symbol type="array" name="config_serviceStateLocationAllowedPackages" />
		<java-symbol type="dimen" name="status_bar_height_default" />
		<java-symbol type="array" name="config_network_policy_manager_replacing_packages" />
		</resources>

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+51 −43

Original line number	Diff line number	Diff line
		@@ -180,7 +180,6 @@ import android.content.ContentResolver;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.SharedPreferences;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.IPackageManager;
		import android.content.pm.PackageInfo;
		@@ -377,6 +376,9 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		private static final int VERSION_SUPPORTED_CARRIER_USAGE = 13;
		private static final int VERSION_LATEST = VERSION_SUPPORTED_CARRIER_USAGE;

		private static final int E_VERSION_INIT = 1;
		private static final int E_VERSION_LATEST = 2;

		@VisibleForTesting
		public static final int TYPE_WARNING = SystemMessage.NOTE_NET_WARNING;
		@VisibleForTesting
		@@ -397,6 +399,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		private static final String TAG_XML_UTILS_INT_ARRAY = "int-array";

		private static final String ATTR_VERSION = "version";
		private static final String ATTR_E_VERSION = "eVersion";
		private static final String ATTR_RESTRICT_BACKGROUND = "restrictBackground";
		private static final String ATTR_NETWORK_TEMPLATE = "networkTemplate";
		private static final String ATTR_SUBSCRIBER_ID = "subscriberId";
		@@ -1157,7 +1160,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		final int uid = intent.getIntExtra(EXTRA_UID, -1);
		if (uid == -1) return;

		if (intent.getBooleanExtra(EXTRA_REPLACING, false) && !doesUidMatchPackages(uid)) {
		if (intent.getBooleanExtra(EXTRA_REPLACING, false)) {
		if (LOGV) Slog.v(TAG, "ACTION_PACKAGE_ADDED Not new app, skip it uid=" + uid);
		return;
		}
		@@ -1324,47 +1327,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		}
		};

		private boolean doesUidMatchPackages(int uid) {
		final String packageName = getPackageForUid(uid);
		if (packageName == null \|\| !isSystemApp(uid)) return false;

		final Context deviceContext = mContext.createDeviceProtectedStorageContext();
		final File prefsFile = new File(new File(Environment.getDataSystemDirectory(),
		"shared_prefs"), "network_policy_whitelist_config.xml");
		SharedPreferences mSharedPreferences =
		deviceContext.getSharedPreferences(prefsFile, Context.MODE_PRIVATE);

		String[] packagePairs = mContext.getResources().getStringArray(
		com.android.internal.R.array.config_network_policy_manager_replacing_packages);

		for (String packageToMatch : packagePairs) {
		if (packageToMatch == null
		\|\| mSharedPreferences.getBoolean(packageToMatch, false)) continue;

		if (packageName.equals(packageToMatch)) {
		if (LOGD) Log.d(TAG, "UID match found packageName: " + packageName);
		mSharedPreferences.edit().putBoolean(packageToMatch, true).apply();
		return !hasInternetPermissionUL(uid);
		}
		}

		if (LOGD) Log.d(TAG, "UID matches not found for packageName: " + packageName);
		return false;
		}

		private boolean isSystemApp(int uid) {
		final String packageName = getPackageForUid(uid);
		if (packageName == null) return false;
		final ApplicationInfo appInfo;
		try {
		appInfo = mContext.getPackageManager().getApplicationInfo(packageName,
		PackageManager.MATCH_UNINSTALLED_PACKAGES);
		} catch (PackageManager.NameNotFoundException ignored) {
		return false;
		}
		return appInfo.isSystemApp();
		}

		private static boolean updateCapabilityChange(SparseBooleanArray lastValues, boolean newValue,
		Network network) {
		final boolean lastValue = lastValues.get(network.getNetId(), false);
		@@ -2524,6 +2486,26 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		}
		}

		private void allowOnRestrictedNetworks(List<String> packageNames) {
		Set<Integer> uids =
		ConnectivitySettingsManager.getUidsAllowedOnRestrictedNetworks(mContext);
		for (UserInfo userInfo : UserManager.get(mContext).getUsers()) {
		for (final String packageName : packageNames) {
		final int uid = getUidForPackage(packageName, userInfo.id);
		if (uid == -1) {
		continue;
		}
		Log.i(TAG, "allowOnRestrictedNetworks: enable network access for: "
		+ packageName);
		uids.add(uid);
		mInternetPermissionMap.delete(uid);
		updateRestrictionRulesForUidUL(uid);
		}
		}

		ConnectivitySettingsManager.setUidsAllowedOnRestrictedNetworks(mContext, uids);
		}

		@GuardedBy({"mUidRulesFirstLock", "mNetworkPoliciesSecondLock"})
		private void readPolicyAL() {
		if (LOGV) Slog.v(TAG, "readPolicyAL()");
		@@ -2561,6 +2543,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {

		int type;
		int version = VERSION_INIT;
		int eVersion = E_VERSION_INIT;
		boolean insideAllowlist = false;
		while ((type = in.next()) != END_DOCUMENT) {
		final String tag = in.getName();
		@@ -2568,6 +2551,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		if (TAG_POLICY_LIST.equals(tag)) {
		final boolean oldValue = mRestrictBackground;
		version = readIntAttribute(in, ATTR_VERSION);
		eVersion = readIntAttribute(in, ATTR_E_VERSION, eVersion);
		mLoadedRestrictBackground = (version >= VERSION_ADDED_RESTRICT_BACKGROUND)
		&& readBooleanAttribute(in, ATTR_RESTRICT_BACKGROUND);
		} else if (TAG_NETWORK_POLICY.equals(tag)) {
		@@ -2767,6 +2751,29 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		Slog.w(TAG, "unable to update policy on UID " + uid);
		}
		}

		Log.i(TAG, "Current eVersion: " + eVersion);
		if (eVersion < E_VERSION_LATEST) {
		List<String> packageNames = new ArrayList<>();

		switch (eVersion) {
		case 1:
		packageNames.add("com.android.vending");
		packageNames.add("foundation.e.blissweather");
		// Fall-through intended
		case 2:
		case 3:
		// packageNames.add("com.android.example");
		// Add new packages here for future use cases.
		break; // Break to end the block after adding eVersion 2 or 3
		default:
		break;
		}

		if (!packageNames.isEmpty()) {
		allowOnRestrictedNetworks(packageNames);
		}
		}
		}

		/**
		@@ -2931,6 +2938,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		private void writeUidIndependentAttributes(TypedXmlSerializer out) throws IOException {
		out.startTag(null, TAG_POLICY_LIST);
		writeIntAttribute(out, ATTR_VERSION, VERSION_LATEST);
		writeIntAttribute(out, ATTR_E_VERSION, E_VERSION_LATEST);
		writeBooleanAttribute(out, ATTR_RESTRICT_BACKGROUND, mRestrictBackground);

		// write all known network policies