Merge cherrypicks of [3898937, 3898958, 3899077, 3897885, 3898496, 3898245,... (1477a4f6) · Commits · e / os / android_frameworks_base

core/java/android/content/PermissionChecker.java

0 → 100644

+173 −0

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

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.app.AppOpsManager;
		import android.content.pm.PackageManager;
		import android.os.Binder;
		import android.os.Process;

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

		/**
		* This class provides permission check APIs that verify both the
		* permission and the associated app op for this permission if
		* such is defined.
		* <p>
		* In the new permission model permissions with protection level
		* dangerous are runtime permissions. For apps targeting {@link android.os.Build.VERSION_CODES#M}
		* and above the user may not grant such permissions or revoke
		* them at any time. For apps targeting API lower than {@link android.os.Build.VERSION_CODES#M}
		* these permissions are always granted as such apps do not expect
		* permission revocations and would crash. Therefore, when the
		* user disables a permission for a legacy app in the UI the
		* platform disables the APIs guarded by this permission making
		* them a no-op which is doing nothing or returning an empty
		* result or default error.
		* </p>
		* <p>
		* It is important that when you perform an operation on behalf of
		* another app you use these APIs to check for permissions as the
		* app may be a legacy app that does not participate in the new
		* permission model for which the user had disabled the "permission"
		* which is achieved by disallowing the corresponding app op.
		* </p>
		*
		* @hide
		*/
		public final class PermissionChecker {
		/** Permission result: The permission is granted. */
		public static final int PERMISSION_GRANTED = PackageManager.PERMISSION_GRANTED;

		/** Permission result: The permission is denied. */
		public static final int PERMISSION_DENIED = PackageManager.PERMISSION_DENIED;

		/** Permission result: The permission is denied because the app op is not allowed. */
		public static final int PERMISSION_DENIED_APP_OP = PackageManager.PERMISSION_DENIED - 1;

		/** @hide */
		@IntDef({PERMISSION_GRANTED,
		PERMISSION_DENIED,
		PERMISSION_DENIED_APP_OP})
		@Retention(RetentionPolicy.SOURCE)
		public @interface PermissionResult {}

		private PermissionChecker() {
		/* do nothing */
		}

		/**
		* Checks whether a given package in a UID and PID has a given permission
		* and whether the app op that corresponds to this permission is allowed.
		*
		* @param context Context for accessing resources.
		* @param permission The permission to check.
		* @param pid The process id for which to check.
		* @param uid The uid for which to check.
		* @param packageName The package name for which to check. If null the
		* the first package for the calling UID will be used.
		* @return The permission check result which is either {@link #PERMISSION_GRANTED}
		* or {@link #PERMISSION_DENIED} or {@link #PERMISSION_DENIED_APP_OP}.
		*/
		@PermissionResult
		public static int checkPermission(@NonNull Context context, @NonNull String permission,
		int pid, int uid, @Nullable String packageName) {
		if (context.checkPermission(permission, pid, uid) == PackageManager.PERMISSION_DENIED) {
		return PERMISSION_DENIED;
		}

		AppOpsManager appOpsManager = context.getSystemService(AppOpsManager.class);
		String op = appOpsManager.permissionToOp(permission);
		if (op == null) {
		return PERMISSION_GRANTED;
		}

		if (packageName == null) {
		String[] packageNames = context.getPackageManager().getPackagesForUid(uid);
		if (packageNames == null \|\| packageNames.length <= 0) {
		return PERMISSION_DENIED;
		}
		packageName = packageNames[0];
		}

		if (appOpsManager.noteProxyOpNoThrow(op, packageName)
		!= AppOpsManager.MODE_ALLOWED) {
		return PERMISSION_DENIED_APP_OP;
		}

		return PERMISSION_GRANTED;
		}

		/**
		* Checks whether your app has a given permission and whether the app op
		* that corresponds to this permission is allowed.
		*
		* @param context Context for accessing resources.
		* @param permission The permission to check.
		* @return The permission check result which is either {@link #PERMISSION_GRANTED}
		* or {@link #PERMISSION_DENIED} or {@link #PERMISSION_DENIED_APP_OP}.
		*/
		@PermissionResult
		public static int checkSelfPermission(@NonNull Context context,
		@NonNull String permission) {
		return checkPermission(context, permission, Process.myPid(),
		Process.myUid(), context.getPackageName());
		}

		/**
		* Checks whether the IPC you are handling has a given permission and whether
		* the app op that corresponds to this permission is allowed.
		*
		* @param context Context for accessing resources.
		* @param permission The permission to check.
		* @param packageName The package name making the IPC. If null the
		* the first package for the calling UID will be used.
		* @return The permission check result which is either {@link #PERMISSION_GRANTED}
		* or {@link #PERMISSION_DENIED} or {@link #PERMISSION_DENIED_APP_OP}.
		*/
		@PermissionResult
		public static int checkCallingPermission(@NonNull Context context,
		@NonNull String permission, @Nullable String packageName) {
		if (Binder.getCallingPid() == Process.myPid()) {
		return PERMISSION_DENIED;
		}
		return checkPermission(context, permission, Binder.getCallingPid(),
		Binder.getCallingUid(), packageName);
		}

		/**
		* Checks whether the IPC you are handling or your app has a given permission
		* and whether the app op that corresponds to this permission is allowed.
		*
		* @param context Context for accessing resources.
		* @param permission The permission to check.
		* @return The permission check result which is either {@link #PERMISSION_GRANTED}
		* or {@link #PERMISSION_DENIED} or {@link #PERMISSION_DENIED_APP_OP}.
		*/
		@PermissionResult
		public static int checkCallingOrSelfPermission(@NonNull Context context,
		@NonNull String permission) {
		String packageName = (Binder.getCallingPid() == Process.myPid())
		? context.getPackageName() : null;
		return checkPermission(context, permission, Binder.getCallingPid(),
		Binder.getCallingUid(), packageName);
		}
		}

core/java/android/speech/RecognitionService.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ import android.annotation.SdkConstant;
		import android.annotation.SdkConstant.SdkConstantType;
		import android.app.Service;
		import android.content.Intent;
		import android.content.pm.PackageManager;
		import android.content.PermissionChecker;
		import android.os.Binder;
		import android.os.Bundle;
		import android.os.Handler;
		@@ -174,8 +174,8 @@ public abstract class RecognitionService extends Service {
		*/
		private boolean checkPermissions(IRecognitionListener listener) {
		if (DBG) Log.d(TAG, "checkPermissions");
		if (RecognitionService.this.checkCallingOrSelfPermission(android.Manifest.permission.
		RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED) {
		if (PermissionChecker.checkCallingOrSelfPermission(this,
		android.Manifest.permission.RECORD_AUDIO) == PermissionChecker.PERMISSION_GRANTED) {
		return true;
		}
		try {

core/java/com/android/internal/app/procstats/SparseMappingTable.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.internal.app.procstats;

		import android.os.Build;
		import android.os.Parcel;
		import android.util.EventLog;
		import android.util.Slog;
		import libcore.util.EmptyArray;

		@@ -529,6 +530,12 @@ public class SparseMappingTable {
		readCompactedLongArray(in, array, size);
		mLongs.add(array);
		}
		// Verify that last array's length is consistent with writeToParcel
		if (N > 0 && mLongs.get(N - 1).length != mNextIndex) {
		EventLog.writeEvent(0x534e4554, "73252178", -1, "");
		throw new IllegalStateException("Expected array of length " + mNextIndex + " but was "
		+ mLongs.get(N - 1).length);
		}
		}

		/**

core/java/com/android/internal/widget/ViewPager.java

+10 −8

Original line number	Diff line number	Diff line
		@@ -31,6 +31,7 @@ import android.os.Parcelable;
		import android.util.AttributeSet;
		import android.util.Log;
		import android.util.MathUtils;
		import android.view.AbsSavedState;
		import android.view.FocusFinder;
		import android.view.Gravity;
		import android.view.KeyEvent;
		@@ -1198,15 +1199,11 @@ public class ViewPager extends ViewGroup {
		* state, in which case it should implement a subclass of this which
		* contains that state.
		*/
		public static class SavedState extends BaseSavedState {
		public static class SavedState extends AbsSavedState {
		int position;
		Parcelable adapterState;
		ClassLoader loader;

		public SavedState(Parcel source) {
		super(source);
		}

		public SavedState(Parcelable superState) {
		super(superState);
		}
		@@ -1225,10 +1222,15 @@ public class ViewPager extends ViewGroup {
		+ " position=" + position + "}";
		}

		public static final Creator<SavedState> CREATOR = new Creator<SavedState>() {
		public static final Creator<SavedState> CREATOR = new ClassLoaderCreator<SavedState>() {
		@Override
		public SavedState createFromParcel(Parcel in, ClassLoader loader) {
		return new SavedState(in, loader);
		}

		@Override
		public SavedState createFromParcel(Parcel in) {
		return new SavedState(in);
		return new SavedState(in, null);
		}
		@Override
		public SavedState[] newArray(int size) {
		@@ -1237,7 +1239,7 @@ public class ViewPager extends ViewGroup {
		};

		SavedState(Parcel in, ClassLoader loader) {
		super(in);
		super(in, loader);
		if (loader == null) {
		loader = getClass().getClassLoader();
		}

services/core/java/com/android/server/NetworkManagementService.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -1777,6 +1777,8 @@ public class NetworkManagementService extends INetworkManagementService.Stub
		@Override
		public void setAllowOnlyVpnForUids(boolean add, UidRange[] uidRanges)
		throws ServiceSpecificException {
		mContext.enforceCallingOrSelfPermission(NETWORK_STACK, TAG);

		try {
		mNetdService.networkRejectNonSecureVpn(add, uidRanges);
		} catch (ServiceSpecificException e) {