Merge "[Ravenwood] Support "partial allowlisting"." into main (8e81106c) · Commits · e / os / android_frameworks_base

core/java/android/content/BroadcastReceiver.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,8 @@ import com.android.internal.os.DebugStore;
		* <a href="{@docRoot}guide/components/broadcasts.html">Broadcasts</a> developer guide.</p></div>
		*
		*/
		@android.ravenwood.annotation.RavenwoodPartiallyAllowlisted
		@android.ravenwood.annotation.RavenwoodKeepPartialClass
		public abstract class BroadcastReceiver {
		@UnsupportedAppUsage
		private PendingResult mPendingResult;
		@@ -361,6 +363,7 @@ public abstract class BroadcastReceiver {
		}
		}

		@android.ravenwood.annotation.RavenwoodKeep
		public BroadcastReceiver() {
		}

+4 −2

Original line number	Diff line number	Diff line
		@@ -50,8 +50,10 @@ class android.net.UriCodec keepclass # no-pta
		class android.telephony.PinResult keepclass # no-pta

		# Just enough to support mocking, no further functionality
		class android.content.BroadcastReceiver keep # no-pta
		method <init> ()V keep
		class android.content.BroadcastReceiver allow-annotation
		method <init> ()V allow-annotation

		# TODO: Convert the following policies to "allow-annotation".
		class android.content.Context keep # no-pta
		method <init> ()V keep
		method getSystemService (Ljava/lang/Class;)Ljava/lang/Object; keep # no-pta

+3 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,9 @@
		--ignore-annotation
		android.ravenwood.annotation.RavenwoodIgnore

		--partially-allowed-annotation
		android.ravenwood.annotation.RavenwoodPartiallyAllowlisted

		--substitute-annotation
		android.ravenwood.annotation.RavenwoodReplace

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2023 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 android.hosttest.annotation;

		import static java.lang.annotation.ElementType.TYPE;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.lang.annotation.Target;

		@Target({TYPE})
		@Retention(RetentionPolicy.CLASS)
		public @interface HostSideTestPartiallyAllowlisted {
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,9 @@
		--keep-class-annotation
		android.hosttest.annotation.HostSideTestWholeClassKeep

		--partially-allowed-annotation
		android.hosttest.annotation.HostSideTestPartiallyAllowlisted

		--throw-annotation
		android.hosttest.annotation.HostSideTestThrow