Snap for 7447836 from 466698f9afc2b4930544c07776493d4bce915f24 to sc-release (00c91cff) · Commits · e / os / android_frameworks_base

Android.bp

+1 −0

0 → 100644

+36 −0

Original line number	Diff line number	Diff line
		// Copyright 2021 The Android Open Source Project
		//
		// Licensed under the Apache License, Version 2.0 (the "License");
		// you may not use this file except in compliance with the License.
		// You may obtain a copy of the License at
		//
		// http://www.apache.org/licenses/LICENSE-2.0
		//
		// Unless required by applicable law or agreed to in writing, software
		// distributed under the License is distributed on an "AS IS" BASIS,
		// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		// See the License for the specific language governing permissions and
		// limitations under the License.

		java_library_host {
		name: "platformtestprotos",
		srcs: [
		":libstats_atom_enum_protos",
		":libstats_atom_message_protos",
		":libstats_internal_protos",
		":statsd_internal_protos",
		],
		libs: [
		"libprotobuf-java-full",
		],
		proto: {
		include_dirs: [
		"external/protobuf/src",
		"frameworks/proto_logging/stats",
		],
		type: "full",
		},
		errorprone: {
		javacflags: ["-Xep:MissingOverride:OFF"], // b/72714520
		},
		}

+2 −3

Original line number	Diff line number	Diff line
		@@ -158,10 +158,9 @@ class ConfigurationController {
		int configDiff;
		boolean equivalent;

		synchronized (mResourcesManager) {
		final Resources.Theme systemTheme = mActivityThread.getSystemContext().getTheme();
		final Resources.Theme systemUiTheme = mActivityThread.getSystemUiContext().getTheme();

		synchronized (mResourcesManager) {
		if (mPendingConfiguration != null) {
		if (!mPendingConfiguration.isOtherSeqNewer(config)) {
		config = mPendingConfiguration;

+4 −0

Original line number	Diff line number	Diff line
		@@ -6845,6 +6845,10 @@ public class DevicePolicyManager {
		* <p> Enabling lockdown via {@code lockdownEnabled} argument carries the risk that any failure
		* of the VPN provider could break networking for all apps. This method clears any lockdown
		* allowlist set by {@link #setAlwaysOnVpnPackage(ComponentName, String, boolean, Set)}.
		* <p> Starting from {@link android.os.Build.VERSION_CODES#S API 31} calling this method with
		* {@code vpnPackage} set to {@code null} only removes the existing configuration if it was
		* previously created by this admin. To remove VPN configuration created by the user use
		* {@link UserManager#DISALLOW_CONFIG_VPN}.
		*
		* @param vpnPackage The package name for an installed VPN app on the device, or {@code null} to
		* remove an existing always-on VPN configuration.

+0 −1

Original line number	Diff line number	Diff line
		@@ -265,5 +265,4 @@ public abstract class DevicePolicyManagerInternal {
		*/
		public abstract void notifyUnsafeOperationStateChanged(DevicePolicySafetyChecker checker,
		@OperationSafetyReason int reason, boolean isSafe);

		}