Merge "Allow apps to collect which appops were noted" (8e6a69c3) · Commits · e / os / android_frameworks_base

api/current.txt

+37 −7

Original line number	Diff line number	Diff line
		@@ -4279,14 +4279,21 @@ package android.app {
		method public void checkPackage(int, @NonNull String);
		method public void finishOp(@NonNull String, int, @NonNull String);
		method public boolean isOpActive(@NonNull String, int, @NonNull String);
		method public int noteOp(@NonNull String, int, @NonNull String);
		method public int noteOpNoThrow(@NonNull String, int, @NonNull String);
		method public int noteProxyOp(@NonNull String, @NonNull String);
		method public int noteProxyOpNoThrow(@NonNull String, @NonNull String);
		method public int noteProxyOpNoThrow(@NonNull String, @Nullable String, int);
		method @Deprecated public int noteOp(@NonNull String, int, @NonNull String);
		method public int noteOp(@NonNull String, int, @Nullable String, @Nullable String);
		method @Deprecated public int noteOpNoThrow(@NonNull String, int, @NonNull String);
		method public int noteOpNoThrow(@NonNull String, int, @NonNull String, @Nullable String);
		method @Deprecated public int noteProxyOp(@NonNull String, @NonNull String);
		method public int noteProxyOp(@NonNull String, @Nullable String, int, @Nullable String);
		method @Deprecated public int noteProxyOpNoThrow(@NonNull String, @NonNull String);
		method @Deprecated public int noteProxyOpNoThrow(@NonNull String, @Nullable String, int);
		method public int noteProxyOpNoThrow(@NonNull String, @Nullable String, int, @Nullable String);
		method public static String permissionToOp(String);
		method public int startOp(@NonNull String, int, @NonNull String);
		method public int startOpNoThrow(@NonNull String, int, @NonNull String);
		method public void setNotedAppOpsCollector(@Nullable android.app.AppOpsManager.AppOpsCollector);
		method @Deprecated public int startOp(@NonNull String, int, @NonNull String);
		method public int startOp(@NonNull String, int, @Nullable String, @Nullable String);
		method @Deprecated public int startOpNoThrow(@NonNull String, int, @NonNull String);
		method public int startOpNoThrow(@NonNull String, int, @NonNull String, @Nullable String);
		method public void startWatchingActive(@NonNull String[], @NonNull java.util.concurrent.Executor, @NonNull android.app.AppOpsManager.OnOpActiveChangedListener);
		method public void startWatchingMode(@NonNull String, @Nullable String, @NonNull android.app.AppOpsManager.OnOpChangedListener);
		method public void startWatchingMode(@NonNull String, @Nullable String, int, @NonNull android.app.AppOpsManager.OnOpChangedListener);
		@@ -4338,6 +4345,14 @@ package android.app {
		field public static final int WATCH_FOREGROUND_CHANGES = 1; // 0x1
		}

		public abstract static class AppOpsManager.AppOpsCollector {
		ctor public AppOpsManager.AppOpsCollector();
		method @NonNull public java.util.concurrent.Executor getAsyncNotedExecutor();
		method public abstract void onAsyncNoted(@NonNull android.app.AsyncNotedAppOp);
		method public abstract void onNoted(@NonNull android.app.SyncNotedAppOp);
		method public abstract void onSelfNoted(@NonNull android.app.SyncNotedAppOp);
		}

		public static interface AppOpsManager.OnOpActiveChangedListener {
		method public void onOpActiveChanged(@NonNull String, int, @NonNull String, boolean);
		}
		@@ -4458,6 +4473,17 @@ package android.app {
		field public String serviceDetails;
		}

		public final class AsyncNotedAppOp implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public String getMessage();
		method @Nullable public String getNotingPackageName();
		method @IntRange(from=0) public int getNotingUid();
		method @NonNull public String getOp();
		method @IntRange(from=0) public long getTime();
		method public void writeToParcel(android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.app.AsyncNotedAppOp> CREATOR;
		}

		public final class AuthenticationRequiredException extends java.lang.SecurityException implements android.os.Parcelable {
		ctor public AuthenticationRequiredException(Throwable, android.app.PendingIntent);
		method public int describeContents();
		@@ -6267,6 +6293,10 @@ package android.app {
		public class StatusBarManager {
		}

		public final class SyncNotedAppOp {
		method @NonNull public String getOp();
		}

		@Deprecated public class TabActivity extends android.app.ActivityGroup {
		ctor @Deprecated public TabActivity();
		method @Deprecated public android.widget.TabHost getTabHost();

core/java/android/app/AppOpsManager.java

+827 −215

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/app/AsyncNotedAppOp.aidl

0 → 100644

+19 −0

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

		parcelable AsyncNotedAppOp;

core/java/android/app/AsyncNotedAppOp.java

0 → 100644

+245 −0

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

		import android.annotation.IntRange;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.os.Parcelable;

		import com.android.internal.annotations.Immutable;
		import com.android.internal.util.DataClass;

		/**
		* When an {@link AppOpsManager#noteOp(String, int, String, String) app-op is noted} and the
		* app the app-op is noted for has a {@link AppOpsManager.AppOpsCollector} registered the note-event
		* needs to be delivered to the collector. Usually this is done via an {@link SyncNotedAppOp}, but
		* in some cases this is not possible. In this case an {@link AsyncNotedAppOp} is send to the system
		* server and then forwarded to the {@link AppOpsManager.AppOpsCollector} in the app.
		*/
		@Immutable
		@DataClass(genEqualsHashCode = true,
		genAidl = true,
		genHiddenConstructor = true)
		// - We don't expose the opCode, but rather the public name of the op, hence use a non-standard
		// getter
		@DataClass.Suppress({"getOpCode"})
		public final class AsyncNotedAppOp implements Parcelable {
		/** Op that was noted */
		private final @IntRange(from = 0, to = AppOpsManager._NUM_OP - 1) int mOpCode;

		/** Uid that noted the op */
		private final @IntRange(from = 0) int mNotingUid;

		/**
		* Package that noted the op. {@code null} if the package name that noted the op could be not
		* be determined (e.g. when the op is noted from native code).
		*/
		private final @Nullable String mNotingPackageName;

		/** Message associated with the noteOp. This message is set by the app noting the op */
		private final @NonNull String mMessage;

		/** Milliseconds since epoch when the op was noted */
		private final @IntRange(from = 0) long mTime;

		/**
		* @return Op that was noted.
		*/
		public @NonNull String getOp() {
		return AppOpsManager.opToPublicName(mOpCode);
		}



		// Code below generated by codegen v1.0.0.
		//
		// DO NOT MODIFY!
		//
		// To regenerate run:
		// $ codegen $ANDROID_BUILD_TOP/frameworks/base/core/java/android/app/AsyncNotedAppOp.java
		//
		// CHECKSTYLE:OFF Generated code

		/**
		* Creates a new AsyncNotedAppOp.
		*
		* @param opCode
		* Op that was noted
		* @param notingUid
		* Uid that noted the op
		* @param notingPackageName
		* Package that noted the op
		* @param message
		* Message associated with the noteOp. This message is set by the app noting the op
		* @param time
		* Milliseconds since epoch when the op was noted
		* @hide
		*/
		@DataClass.Generated.Member
		public AsyncNotedAppOp(
		@IntRange(from = 0, to = AppOpsManager._NUM_OP - 1) int opCode,
		@IntRange(from = 0) int notingUid,
		@Nullable String notingPackageName,
		@NonNull String message,
		@IntRange(from = 0) long time) {
		this.mOpCode = opCode;
		com.android.internal.util.AnnotationValidations.validate(
		IntRange.class, null, mOpCode,
		"from", 0,
		"to", AppOpsManager._NUM_OP - 1);
		this.mNotingUid = notingUid;
		com.android.internal.util.AnnotationValidations.validate(
		IntRange.class, null, mNotingUid,
		"from", 0);
		this.mNotingPackageName = notingPackageName;
		this.mMessage = message;
		com.android.internal.util.AnnotationValidations.validate(
		NonNull.class, null, mMessage);
		this.mTime = time;
		com.android.internal.util.AnnotationValidations.validate(
		IntRange.class, null, mTime,
		"from", 0);

		// onConstructed(); // You can define this method to get a callback
		}

		/**
		* Uid that noted the op
		*/
		@DataClass.Generated.Member
		public @IntRange(from = 0) int getNotingUid() {
		return mNotingUid;
		}

		/**
		* Package that noted the op
		*/
		@DataClass.Generated.Member
		public @Nullable String getNotingPackageName() {
		return mNotingPackageName;
		}

		/**
		* Message associated with the noteOp. This message is set by the app noting the op
		*/
		@DataClass.Generated.Member
		public @NonNull String getMessage() {
		return mMessage;
		}

		/**
		* Milliseconds since epoch when the op was noted
		*/
		@DataClass.Generated.Member
		public @IntRange(from = 0) long getTime() {
		return mTime;
		}

		@Override
		@DataClass.Generated.Member
		public boolean equals(Object o) {
		// You can override field equality logic by defining either of the methods like:
		// boolean fieldNameEquals(AsyncNotedAppOp other) { ... }
		// boolean fieldNameEquals(FieldType otherValue) { ... }

		if (this == o) return true;
		if (o == null \|\| getClass() != o.getClass()) return false;
		@SuppressWarnings("unchecked")
		AsyncNotedAppOp that = (AsyncNotedAppOp) o;
		//noinspection PointlessBooleanExpression
		return true
		&& mOpCode == that.mOpCode
		&& mNotingUid == that.mNotingUid
		&& java.util.Objects.equals(mNotingPackageName, that.mNotingPackageName)
		&& java.util.Objects.equals(mMessage, that.mMessage)
		&& mTime == that.mTime;
		}

		@Override
		@DataClass.Generated.Member
		public int hashCode() {
		// You can override field hashCode logic by defining methods like:
		// int fieldNameHashCode() { ... }

		int _hash = 1;
		_hash = 31 * _hash + mOpCode;
		_hash = 31 * _hash + mNotingUid;
		_hash = 31 * _hash + java.util.Objects.hashCode(mNotingPackageName);
		_hash = 31 * _hash + java.util.Objects.hashCode(mMessage);
		_hash = 31 * _hash + Long.hashCode(mTime);
		return _hash;
		}

		@Override
		@DataClass.Generated.Member
		public void writeToParcel(android.os.Parcel dest, int flags) {
		// You can override field parcelling by defining methods like:
		// void parcelFieldName(Parcel dest, int flags) { ... }

		byte flg = 0;
		if (mNotingPackageName != null) flg \|= 0x4;
		dest.writeByte(flg);
		dest.writeInt(mOpCode);
		dest.writeInt(mNotingUid);
		if (mNotingPackageName != null) dest.writeString(mNotingPackageName);
		dest.writeString(mMessage);
		dest.writeLong(mTime);
		}

		@Override
		@DataClass.Generated.Member
		public int describeContents() { return 0; }

		@DataClass.Generated.Member
		public static final @NonNull Parcelable.Creator<AsyncNotedAppOp> CREATOR
		= new Parcelable.Creator<AsyncNotedAppOp>() {
		@Override
		public AsyncNotedAppOp[] newArray(int size) {
		return new AsyncNotedAppOp[size];
		}

		@Override
		@SuppressWarnings({"unchecked", "RedundantCast"})
		public AsyncNotedAppOp createFromParcel(android.os.Parcel in) {
		// You can override field unparcelling by defining methods like:
		// static FieldType unparcelFieldName(Parcel in) { ... }

		byte flg = in.readByte();
		int opCode = in.readInt();
		int notingUid = in.readInt();
		String notingPackageName = (flg & 0x4) == 0 ? null : in.readString();
		String message = in.readString();
		long time = in.readLong();
		return new AsyncNotedAppOp(
		opCode,
		notingUid,
		notingPackageName,
		message,
		time);
		}
		};

		@DataClass.Generated(
		time = 1566503083973L,
		codegenVersion = "1.0.0",
		sourceFile = "frameworks/base/core/java/android/app/AsyncNotedAppOp.java",
		inputSignatures = "private final @android.annotation.IntRange(from=0L, to=90L) int mOpCode\nprivate final @android.annotation.IntRange(from=0L) int mNotingUid\nprivate final @android.annotation.Nullable java.lang.String mNotingPackageName\nprivate final @android.annotation.NonNull java.lang.String mMessage\nprivate final @android.annotation.IntRange(from=0L) long mTime\npublic @android.annotation.NonNull java.lang.String getOp()\nclass AsyncNotedAppOp extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genEqualsHashCode=true, genAidl=true, genHiddenConstructor=true)")
		@Deprecated
		private void __metadata() {}

		}

core/java/android/app/SyncNotedAppOp.java

0 → 100644

+68 −0

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

		import android.annotation.IntRange;
		import android.annotation.NonNull;

		import com.android.internal.annotations.Immutable;

		/**
		* Description of an app-op that was noted for the current process.
		*
		* <p>This is either delivered after a
		* {@link AppOpsManager.AppOpsCollector#onNoted(SyncNotedAppOp) two way binder call} or
		* when the app
		* {@link AppOpsManager.AppOpsCollector#onSelfNoted(SyncNotedAppOp) notes an app-op for
		* itself}.
		*/
		@Immutable
		public final class SyncNotedAppOp {
		private final int mOpCode;

		/**
		* @return The op that was noted.
		*/
		public @NonNull String getOp() {
		return AppOpsManager.opToPublicName(mOpCode);
		}

		/**
		* Create a new sync op description
		*
		* @param opCode The op that was noted
		*
		* @hide
		*/
		public SyncNotedAppOp(@IntRange(from = 0, to = AppOpsManager._NUM_OP - 1) int opCode) {
		mOpCode = opCode;
		}

		@Override
		public boolean equals(Object other) {
		if (!(other instanceof SyncNotedAppOp)) {
		return false;
		}

		return mOpCode == ((SyncNotedAppOp) other).mOpCode;
		}

		@Override
		public int hashCode() {
		return mOpCode;
		}
		}