Merge changes I30a3323d,If328baac (8a9ed197) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/appop/AppOpsCheckingServiceImpl.java

+9 −10

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ import static android.app.AppOpsManager.OP_NONE;
		import static android.app.AppOpsManager.WATCH_FOREGROUND_CHANGES;
		import static android.app.AppOpsManager.opRestrictsRead;

		import static com.android.server.appop.AppOpsServiceImpl.ModeCallback.ALL_OPS;
		import static com.android.server.appop.AppOpsService.ModeCallback.ALL_OPS;

		import android.Manifest;
		import android.annotation.NonNull;
		@@ -218,7 +218,7 @@ public class AppOpsCheckingServiceImpl implements AppOpsCheckingServiceInterface
		}

		@Override
		public boolean arePackageModesDefault(@NonNull String packageMode, @UserIdInt int userId) {
		public boolean arePackageModesDefault(String packageMode, @UserIdInt int userId) {
		synchronized (mLock) {
		ArrayMap<String, SparseIntArray> packageModes = mUserPackageModes.get(userId, null);
		if (packageModes == null) {
		@@ -490,16 +490,15 @@ public class AppOpsCheckingServiceImpl implements AppOpsCheckingServiceInterface
		}

		@Override
		public SparseBooleanArray evalForegroundUidOps(int uid,
		@Nullable SparseBooleanArray foregroundOps) {
		public SparseBooleanArray evalForegroundUidOps(int uid, SparseBooleanArray foregroundOps) {
		synchronized (mLock) {
		return evalForegroundOps(mUidModes.get(uid), foregroundOps);
		}
		}

		@Override
		public SparseBooleanArray evalForegroundPackageOps(@NonNull String packageName,
		@Nullable SparseBooleanArray foregroundOps, @UserIdInt int userId) {
		public SparseBooleanArray evalForegroundPackageOps(String packageName,
		SparseBooleanArray foregroundOps, @UserIdInt int userId) {
		synchronized (mLock) {
		ArrayMap<String, SparseIntArray> packageModes = mUserPackageModes.get(userId, null);
		return evalForegroundOps(packageModes == null ? null : packageModes.get(packageName),
		@@ -538,8 +537,8 @@ public class AppOpsCheckingServiceImpl implements AppOpsCheckingServiceInterface
		}

		@Override
		public boolean dumpListeners(int dumpOp, int dumpUid, @Nullable String dumpPackage,
		@NonNull PrintWriter printWriter) {
		public boolean dumpListeners(int dumpOp, int dumpUid, String dumpPackage,
		PrintWriter printWriter) {
		boolean needSep = false;
		if (mOpModeWatchers.size() > 0) {
		boolean printedHeader = false;

services/core/java/com/android/server/appop/AppOpsCheckingServiceInterface.java

+5 −6

Original line number	Diff line number	Diff line
		@@ -103,7 +103,7 @@ public interface AppOpsCheckingServiceInterface {
		* @param packageName package name.
		* @param userId user id associated with the package.
		*/
		boolean arePackageModesDefault(@NonNull String packageName, @UserIdInt int userId);
		boolean arePackageModesDefault(String packageName, @UserIdInt int userId);

		/**
		* Stop tracking app-op modes for all uid and packages.
		@@ -184,7 +184,7 @@ public interface AppOpsCheckingServiceInterface {
		* @param foregroundOps boolean array where app-ops that have MODE_FOREGROUND are marked true.
		* @return foregroundOps.
		*/
		SparseBooleanArray evalForegroundUidOps(int uid, @Nullable SparseBooleanArray foregroundOps);
		SparseBooleanArray evalForegroundUidOps(int uid, SparseBooleanArray foregroundOps);

		/**
		* Go over the list of app-ops for the package name and mark app-ops with MODE_FOREGROUND in
		@@ -194,8 +194,8 @@ public interface AppOpsCheckingServiceInterface {
		* @param userId user id associated with the package.
		* @return foregroundOps.
		*/
		SparseBooleanArray evalForegroundPackageOps(@NonNull String packageName,
		@Nullable SparseBooleanArray foregroundOps, @UserIdInt int userId);
		SparseBooleanArray evalForegroundPackageOps(String packageName,
		SparseBooleanArray foregroundOps, @UserIdInt int userId);

		/**
		* Dump op mode and package mode listeners and their details.
		@@ -205,6 +205,5 @@ public interface AppOpsCheckingServiceInterface {
		* @param dumpPackage if not null and if dumpOp is -1, dumps watchers for the package name.
		* @param printWriter writer to dump to.
		*/
		boolean dumpListeners(int dumpOp, int dumpUid, @Nullable String dumpPackage,
		@NonNull PrintWriter printWriter);
		boolean dumpListeners(int dumpOp, int dumpUid, String dumpPackage, PrintWriter printWriter);
		}

services/core/java/com/android/server/appop/AppOpsCheckingServiceTracingDecorator.java

deleted100644 → 0

+0 −279

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.server.appop;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.UserIdInt;
		import android.app.AppOpsManager;
		import android.os.Trace;
		import android.util.ArraySet;
		import android.util.SparseBooleanArray;
		import android.util.SparseIntArray;

		import java.io.PrintWriter;

		/**
		* Surrounds all AppOpsCheckingServiceInterface method calls with Trace.traceBegin and
		* Trace.traceEnd. These traces are used for performance testing.
		*/
		public class AppOpsCheckingServiceTracingDecorator implements AppOpsCheckingServiceInterface {
		private static final long TRACE_TAG = Trace.TRACE_TAG_SYSTEM_SERVER;
		private final AppOpsCheckingServiceInterface mService;

		AppOpsCheckingServiceTracingDecorator(
		@NonNull AppOpsCheckingServiceInterface appOpsCheckingServiceInterface) {
		mService = appOpsCheckingServiceInterface;
		}

		@Override
		public SparseIntArray getNonDefaultUidModes(int uid) {
		Trace.traceBegin(TRACE_TAG,
		"TaggedTracingAppOpsCheckingServiceInterfaceImpl#getNonDefaultUidModes");
		try {
		return mService.getNonDefaultUidModes(uid);
		} finally {
		Trace.traceEnd(TRACE_TAG);
		}
		}

		@Override
		public int getUidMode(int uid, int op) {
		Trace.traceBegin(TRACE_TAG, "TaggedTracingAppOpsCheckingServiceInterfaceImpl#getUidMode");
		try {
		return mService.getUidMode(uid, op);
		} finally {
		Trace.traceEnd(TRACE_TAG);
		}
		}

		@Override
		public boolean setUidMode(int uid, int op, @AppOpsManager.Mode int mode) {
		Trace.traceBegin(TRACE_TAG, "TaggedTracingAppOpsCheckingServiceInterfaceImpl#setUidMode");
		try {
		return mService.setUidMode(uid, op, mode);
		} finally {
		Trace.traceEnd(TRACE_TAG);
		}
		}

		@Override
		public int getPackageMode(@NonNull String packageName, int op, @UserIdInt int userId) {
		Trace.traceBegin(TRACE_TAG,
		"TaggedTracingAppOpsCheckingServiceInterfaceImpl#getPackageMode");
		try {
		return mService.getPackageMode(packageName, op, userId);
		} finally {
		Trace.traceEnd(TRACE_TAG);
		}
		}

		@Override
		public void setPackageMode(@NonNull String packageName, int op, @AppOpsManager.Mode int mode,
		@UserIdInt int userId) {
		Trace.traceBegin(TRACE_TAG,
		"TaggedTracingAppOpsCheckingServiceInterfaceImpl#setPackageMode");
		try {
		mService.setPackageMode(packageName, op, mode, userId);
		} finally {
		Trace.traceEnd(TRACE_TAG);
		}
		}

		@Override
		public boolean removePackage(@NonNull String packageName, @UserIdInt int userId) {
		Trace.traceBegin(TRACE_TAG,
		"TaggedTracingAppOpsCheckingServiceInterfaceImpl#removePackage");
		try {
		return mService.removePackage(packageName, userId);
		} finally {
		Trace.traceEnd(TRACE_TAG);
		}
		}

		@Override
		public void removeUid(int uid) {
		Trace.traceBegin(TRACE_TAG,
		"TaggedTracingAppOpsCheckingServiceInterfaceImpl#removeUid");
		try {
		mService.removeUid(uid);
		} finally {
		Trace.traceEnd(TRACE_TAG);
		}
		}

		@Override
		public boolean areUidModesDefault(int uid) {
		Trace.traceBegin(TRACE_TAG,
		"TaggedTracingAppOpsCheckingServiceInterfaceImpl#areUidModesDefault");
		try {
		return mService.areUidModesDefault(uid);
		} finally {
		Trace.traceEnd(TRACE_TAG);
		}
		}

		@Override
		public boolean arePackageModesDefault(String packageName, @UserIdInt int userId) {
		Trace.traceBegin(TRACE_TAG,
		"TaggedTracingAppOpsCheckingServiceInterfaceImpl#arePackageModesDefault");
		try {
		return mService.arePackageModesDefault(packageName, userId);
		} finally {
		Trace.traceEnd(TRACE_TAG);
		}
		}

		@Override
		public void clearAllModes() {
		Trace.traceBegin(TRACE_TAG,
		"TaggedTracingAppOpsCheckingServiceInterfaceImpl#clearAllModes");
		try {
		mService.clearAllModes();
		} finally {
		Trace.traceEnd(TRACE_TAG);
		}
		}

		@Override
		public void startWatchingOpModeChanged(@NonNull OnOpModeChangedListener changedListener,
		int op) {
		Trace.traceBegin(TRACE_TAG,
		"TaggedTracingAppOpsCheckingServiceInterfaceImpl#startWatchingOpModeChanged");
		try {
		mService.startWatchingOpModeChanged(changedListener, op);
		} finally {
		Trace.traceEnd(TRACE_TAG);
		}
		}

		@Override
		public void startWatchingPackageModeChanged(@NonNull OnOpModeChangedListener changedListener,
		@NonNull String packageName) {
		Trace.traceBegin(TRACE_TAG,
		"TaggedTracingAppOpsCheckingServiceInterfaceImpl#startWatchingPackageModeChanged");
		try {
		mService.startWatchingPackageModeChanged(changedListener, packageName);
		} finally {
		Trace.traceEnd(TRACE_TAG);
		}
		}

		@Override
		public void removeListener(@NonNull OnOpModeChangedListener changedListener) {
		Trace.traceBegin(TRACE_TAG,
		"TaggedTracingAppOpsCheckingServiceInterfaceImpl#removeListener");
		try {
		mService.removeListener(changedListener);
		} finally {
		Trace.traceEnd(TRACE_TAG);
		}
		}

		@Override
		public ArraySet<OnOpModeChangedListener> getOpModeChangedListeners(int op) {
		Trace.traceBegin(TRACE_TAG,
		"TaggedTracingAppOpsCheckingServiceInterfaceImpl#getOpModeChangedListeners");
		try {
		return mService.getOpModeChangedListeners(op);
		} finally {
		Trace.traceEnd(TRACE_TAG);
		}
		}

		@Override
		public ArraySet<OnOpModeChangedListener> getPackageModeChangedListeners(
		@NonNull String packageName) {
		Trace.traceBegin(TRACE_TAG,
		"TaggedTracingAppOpsCheckingServiceInterfaceImpl#getPackageModeChangedListeners");
		try {
		return mService.getPackageModeChangedListeners(packageName);
		} finally {
		Trace.traceEnd(TRACE_TAG);
		}
		}

		@Override
		public void notifyWatchersOfChange(int op, int uid) {
		Trace.traceBegin(TRACE_TAG,
		"TaggedTracingAppOpsCheckingServiceInterfaceImpl#notifyWatchersOfChange");
		try {
		mService.notifyWatchersOfChange(op, uid);
		} finally {
		Trace.traceEnd(TRACE_TAG);
		}
		}

		@Override
		public void notifyOpChanged(@NonNull OnOpModeChangedListener changedListener, int op, int uid,
		@Nullable String packageName) {
		Trace.traceBegin(TRACE_TAG,
		"TaggedTracingAppOpsCheckingServiceInterfaceImpl#notifyOpChanged");
		try {
		mService.notifyOpChanged(changedListener, op, uid, packageName);
		} finally {
		Trace.traceEnd(TRACE_TAG);
		}
		}

		@Override
		public void notifyOpChangedForAllPkgsInUid(int op, int uid, boolean onlyForeground,
		@Nullable OnOpModeChangedListener callbackToIgnore) {
		Trace.traceBegin(TRACE_TAG,
		"TaggedTracingAppOpsCheckingServiceInterfaceImpl#notifyOpChangedForAllPkgsInUid");
		try {
		mService.notifyOpChangedForAllPkgsInUid(op, uid, onlyForeground, callbackToIgnore);
		} finally {
		Trace.traceEnd(TRACE_TAG);
		}
		}

		@Override
		public SparseBooleanArray evalForegroundUidOps(int uid, SparseBooleanArray foregroundOps) {
		Trace.traceBegin(TRACE_TAG,
		"TaggedTracingAppOpsCheckingServiceInterfaceImpl#evalForegroundUidOps");
		try {
		return mService.evalForegroundUidOps(uid, foregroundOps);
		} finally {
		Trace.traceEnd(TRACE_TAG);
		}
		}

		@Override
		public SparseBooleanArray evalForegroundPackageOps(String packageName,
		SparseBooleanArray foregroundOps, @UserIdInt int userId) {
		Trace.traceBegin(TRACE_TAG,
		"TaggedTracingAppOpsCheckingServiceInterfaceImpl#evalForegroundPackageOps");
		try {
		return mService.evalForegroundPackageOps(packageName, foregroundOps, userId);
		} finally {
		Trace.traceEnd(TRACE_TAG);
		}
		}

		@Override
		public boolean dumpListeners(int dumpOp, int dumpUid, String dumpPackage,
		PrintWriter printWriter) {
		Trace.traceBegin(TRACE_TAG,
		"TaggedTracingAppOpsCheckingServiceInterfaceImpl#dumpListeners");
		try {
		return mService.dumpListeners(dumpOp, dumpUid, dumpPackage, printWriter);
		} finally {
		Trace.traceEnd(TRACE_TAG);
		}
		}
		}

services/core/java/com/android/server/appop/AppOpsRestrictionsImpl.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ public class AppOpsRestrictionsImpl implements AppOpsRestrictions {

		private Context mContext;
		private Handler mHandler;
		private AppOpsCheckingServiceInterface mAppOpsServiceInterface;
		private AppOpsCheckingServiceInterface mAppOpsCheckingServiceInterface;

		// Map from (Object token) to (int code) to (boolean restricted)
		private final ArrayMap<Object, SparseBooleanArray> mGlobalRestrictions = new ArrayMap<>();
		@@ -56,10 +56,10 @@ public class AppOpsRestrictionsImpl implements AppOpsRestrictions {
		mUserRestrictionExcludedPackageTags = new ArrayMap<>();

		public AppOpsRestrictionsImpl(Context context, Handler handler,
		AppOpsCheckingServiceInterface appOpsServiceInterface) {
		AppOpsCheckingServiceInterface appOpsCheckingServiceInterface) {
		mContext = context;
		mHandler = handler;
		mAppOpsServiceInterface = appOpsServiceInterface;
		mAppOpsCheckingServiceInterface = appOpsCheckingServiceInterface;
		}

		@Override
		@@ -219,7 +219,7 @@ public class AppOpsRestrictionsImpl implements AppOpsRestrictions {
		int restrictedCodesSize = allUserRestrictedCodes.size();
		for (int j = 0; j < restrictedCodesSize; j++) {
		int code = allUserRestrictedCodes.keyAt(j);
		mHandler.post(() -> mAppOpsServiceInterface.notifyWatchersOfChange(code, UID_ANY));
		mHandler.post(() -> mAppOpsCheckingServiceInterface.notifyWatchersOfChange(code, UID_ANY));
		}
		}

services/core/java/com/android/server/appop/AppOpsService.java

+4525 −382

File changed.

Preview size limit exceeded, changes collapsed.