Merge "Add shims for ConnectivityFrameworkInitializer" (eef90cfe) · Commits · e / os / android_packages_modules_NetworkStack

Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -172,6 +172,7 @@ java_library {
		"NetworkStackApi31Shims",
		"framework-bluetooth",
		"framework-connectivity",
		"framework-connectivity-tiramisu.stubs.module_lib",
		"framework-tethering",
		],
		sdk_version: "module_current",

apishim/29/com/android/networkstack/apishim/api29/ConnectivityFrameworkInitShimImpl.java

0 → 100644

+41 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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.
		*/

		package com.android.networkstack.apishim.api29;

		import android.os.Build;

		import androidx.annotation.RequiresApi;

		import com.android.networkstack.apishim.common.ConnectivityFrameworkInitShim;

		/**
		* Implementation of {@link ConnectivityFrameworkInitShim}.
		*/
		@RequiresApi(Build.VERSION_CODES.Q)
		public class ConnectivityFrameworkInitShimImpl implements ConnectivityFrameworkInitShim {
		/**
		* Get a new instance of {@link NsdShim}.
		*/
		public static ConnectivityFrameworkInitShim newInstance() {
		return new ConnectivityFrameworkInitShimImpl();
		}

		@Override
		public void registerServiceWrappers() {
		// No-op: ConnectivityFrameworkInitializer doesn't exist before S
		}
		}

apishim/30/com/android/networkstack/apishim/api30/ConnectivityFrameworkInitShimImpl.java

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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.
		*/

		package com.android.networkstack.apishim.api30;

		/**
		* Implementation of {@link ConnectivityFrameworkInitShim}.
		*/
		public class ConnectivityFrameworkInitShimImpl extends
		com.android.networkstack.apishim.api29.ConnectivityFrameworkInitShimImpl {
		// Inherit everything from API29 shim
		}

apishim/31/com/android/networkstack/apishim/api31/ConnectivityFrameworkInitShimImpl.java

0 → 100644

+25 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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.
		*/

		package com.android.networkstack.apishim.api31;

		/**
		* Implementation of {@link ConnectivityFrameworkInitShim}.
		*/
		public class ConnectivityFrameworkInitShimImpl extends
		com.android.networkstack.apishim.api30.ConnectivityFrameworkInitShimImpl {
		// Inherit everything from API30 shim
		}

apishim/33/com/android/networkstack/apishim/ConnectivityFrameworkInitShimImpl.java

0 → 100644

+49 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2022 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.
		*/

		package com.android.networkstack.apishim;

		import android.net.ConnectivityFrameworkInitializerTiramisu;
		import android.os.Build;

		import androidx.annotation.RequiresApi;

		import com.android.modules.utils.build.SdkLevel;
		import com.android.networkstack.apishim.common.ConnectivityFrameworkInitShim;

		/**
		* Implementation of {@link ConnectivityFrameworkInitShim}.
		*/
		@RequiresApi(Build.VERSION_CODES.TIRAMISU)
		public class ConnectivityFrameworkInitShimImpl extends
		com.android.networkstack.apishim.api31.ConnectivityFrameworkInitShimImpl {
		/**
		* Get a new instance of {@link ConnectivityFrameworkInitShimImpl}.
		*/
		@RequiresApi(Build.VERSION_CODES.Q)
		public static ConnectivityFrameworkInitShim newInstance() {
		if (SdkLevel.isAtLeastT()) {
		return new ConnectivityFrameworkInitShimImpl();
		} else {
		return new com.android.networkstack.apishim.api31.ConnectivityFrameworkInitShimImpl();
		}
		}

		@Override
		public void registerServiceWrappers() {
		ConnectivityFrameworkInitializerTiramisu.registerServiceWrappers();
		}
		}