Merge remote-tracking branch 'origin/cm-14.1' into v1-nougat (ee8e85b6) · Commits · e / os / android_frameworks_base

core/java/android/accounts/Account.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -88,6 +88,12 @@ public class Account implements Parcelable {
		public Account(Parcel in) {
		this.name = in.readString();
		this.type = in.readString();
		if (TextUtils.isEmpty(name)) {
		throw new android.os.BadParcelableException("the name must not be empty: " + name);
		}
		if (TextUtils.isEmpty(type)) {
		throw new android.os.BadParcelableException("the type must not be empty: " + type);
		}
		this.accessId = in.readString();
		if (accessId != null) {
		synchronized (sAccessedAccounts) {

core/java/android/accounts/GrantCredentialsPermissionActivity.java

+31 −6

Original line number	Diff line number	Diff line
		@@ -16,16 +16,23 @@
		package android.accounts;

		import android.app.Activity;
		import android.content.res.Resources;
		import android.os.Bundle;
		import android.widget.TextView;
		import android.widget.LinearLayout;
		import android.view.View;
		import android.view.LayoutInflater;
		import android.app.ActivityManagerNative;
		import android.content.Context;
		import android.content.Intent;
		import android.content.pm.PackageManager;
		import android.content.res.Resources;
		import android.os.Bundle;
		import android.os.IBinder;
		import android.os.Process;
		import android.os.RemoteException;
		import android.os.UserHandle;
		import android.text.TextUtils;
		import android.util.Log;
		import android.view.LayoutInflater;
		import android.view.View;
		import android.widget.LinearLayout;
		import android.widget.TextView;

		import com.android.internal.R;

		import java.io.IOException;
		@@ -42,11 +49,15 @@ public class GrantCredentialsPermissionActivity extends Activity implements View
		private Account mAccount;
		private String mAuthTokenType;
		private int mUid;
		private int mCallingUid;
		private Bundle mResultBundle = null;
		protected LayoutInflater mInflater;

		protected void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		getWindow().addPrivateFlags(
		android.view.WindowManager.LayoutParams
		.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
		setContentView(R.layout.grant_credentials_permission);
		setTitle(R.string.grant_permissions_header_text);

		@@ -74,6 +85,20 @@ public class GrantCredentialsPermissionActivity extends Activity implements View
		return;
		}

		try {
		IBinder activityToken = getActivityToken();
		mCallingUid = ActivityManagerNative.getDefault().getLaunchedFromUid(activityToken);
		} catch (RemoteException re) {
		// Couldn't figure out caller details
		Log.w(getClass().getSimpleName(), "Unable to get caller identity \n" + re);
		}

		if (!UserHandle.isSameApp(mCallingUid, Process.SYSTEM_UID) && mCallingUid != mUid) {
		setResult(Activity.RESULT_CANCELED);
		finish();
		return;
		}

		String accountTypeLabel;
		try {
		accountTypeLabel = getAccountLabel(mAccount);

packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java

+37 −27

Original line number	Diff line number	Diff line
		@@ -88,6 +88,7 @@ class SaveImageInBackgroundData {
		imageUri = null;
		iconSize = 0;
		}

		void clearContext() {
		context = null;
		}
		@@ -333,7 +334,8 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> {
		mPublicNotificationBuilder
		.setContentTitle(r.getString(R.string.screenshot_saved_title))
		.setContentText(r.getString(R.string.screenshot_saved_text))
		.setContentIntent(PendingIntent.getActivity(mParams.context, 0, launchIntent, 0))
		.setContentIntent(PendingIntent.getActivity(mParams.context, 0, launchIntent,
		PendingIntent.FLAG_IMMUTABLE))
		.setWhen(now)
		.setAutoCancel(true)
		.setColor(context.getColor(
		@@ -341,7 +343,8 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> {
		mNotificationBuilder
		.setContentTitle(r.getString(R.string.screenshot_saved_title))
		.setContentText(r.getString(R.string.screenshot_saved_text))
		.setContentIntent(PendingIntent.getActivity(mParams.context, 0, launchIntent, 0))
		.setContentIntent(PendingIntent.getActivity(mParams.context, 0, launchIntent,
		PendingIntent.FLAG_IMMUTABLE))
		.setWhen(now)
		.setAutoCancel(true)
		.setColor(context.getColor(
		@@ -456,7 +459,8 @@ class GlobalScreenshot {
		mDisplayMatrix = new Matrix();
		mScreenshotLayout = layoutInflater.inflate(R.layout.global_screenshot, null);
		mScreenshotSelectorLayout = layoutInflater.inflate(R.layout.global_screenshot, null);
		mBackgroundView = (ImageView) mScreenshotLayout.findViewById(R.id.global_screenshot_background);
		mBackgroundView = (ImageView) mScreenshotLayout.findViewById(
		R.id.global_screenshot_background);
		mScreenshotView = (ImageView) mScreenshotLayout.findViewById(R.id.global_screenshot);
		mScreenshotFlash = (ImageView) mScreenshotLayout.findViewById(R.id.global_screenshot_flash);
		mScreenshotSelectorView = (ScreenshotSelectorView) mScreenshotSelectorLayout.findViewById(
		@@ -486,6 +490,7 @@ class GlobalScreenshot {
		mWindowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
		mNotificationManager =
		(NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);

		mDisplay = mWindowManager.getDefaultDisplay();
		mDisplayMetrics = new DisplayMetrics();
		mDisplay.getRealMetrics(mDisplayMetrics);
		@@ -731,6 +736,7 @@ class GlobalScreenshot {
		}
		});
		}

		private ValueAnimator createScreenshotDropInAnimation() {
		final float flashPeakDurationPct = ((float) (SCREENSHOT_FLASH_TO_PEAK_DURATION)
		/ SCREENSHOT_DROP_IN_DURATION);
		@@ -792,6 +798,7 @@ class GlobalScreenshot {
		});
		return anim;
		}

		private ValueAnimator createScreenshotDropOutAnimation(int w, int h, boolean statusBarVisible,
		boolean navBarVisible) {
		ValueAnimator anim = ValueAnimator.ofFloat(0f, 1f);
		@@ -813,7 +820,8 @@ class GlobalScreenshot {
		public void onAnimationUpdate(ValueAnimator animation) {
		float t = (Float) animation.getAnimatedValue();
		float scaleT = (SCREENSHOT_DROP_IN_MIN_SCALE + mBgPaddingScale)
		- t * (SCREENSHOT_DROP_IN_MIN_SCALE - SCREENSHOT_FAST_DROP_OUT_MIN_SCALE);
		- t * (SCREENSHOT_DROP_IN_MIN_SCALE
		- SCREENSHOT_FAST_DROP_OUT_MIN_SCALE);
		mBackgroundView.setAlpha((1f - t) * BACKGROUND_ALPHA);
		mScreenshotView.setAlpha(1f - t);
		mScreenshotView.setScaleX(scaleT);
		@@ -840,8 +848,10 @@ class GlobalScreenshot {
		float halfScreenHeight = (h - 2f * mBgPadding) / 2f;
		final float offsetPct = SCREENSHOT_DROP_OUT_MIN_SCALE_OFFSET;
		final PointF finalPos = new PointF(
		-halfScreenWidth + (SCREENSHOT_DROP_OUT_MIN_SCALE + offsetPct) * halfScreenWidth,
		-halfScreenHeight + (SCREENSHOT_DROP_OUT_MIN_SCALE + offsetPct) * halfScreenHeight);
		-halfScreenWidth
		+ (SCREENSHOT_DROP_OUT_MIN_SCALE + offsetPct) * halfScreenWidth,
		-halfScreenHeight
		+ (SCREENSHOT_DROP_OUT_MIN_SCALE + offsetPct) * halfScreenHeight);

		// Animate the screenshot to the status bar
		anim.setDuration(SCREENSHOT_DROP_OUT_DURATION);

services/core/java/com/android/server/fingerprint/AuthenticationClient.java

+85 −2

Original line number	Diff line number	Diff line
		@@ -16,10 +16,16 @@

		package com.android.server.fingerprint;

		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.logging.MetricsProto.MetricsEvent;
		import static android.Manifest.permission.USE_FINGERPRINT;

		import android.content.Context;
		import android.app.ActivityManager;
		import android.app.ActivityManagerNative;
		import android.app.IActivityManager;
		import android.content.ComponentName;
		import android.content.Context;
		import android.content.pm.ApplicationInfo;
		import android.content.pm.PackageManager;
		import android.hardware.fingerprint.Fingerprint;
		import android.hardware.fingerprint.FingerprintManager;
		import android.hardware.fingerprint.IFingerprintDaemon;
		@@ -27,8 +33,14 @@ import android.hardware.fingerprint.IFingerprintServiceReceiver;
		import android.os.IBinder;
		import android.os.RemoteException;
		import android.system.ErrnoException;
		import android.util.EventLog;
		import android.util.Slog;

		import com.android.internal.R;
		import com.android.internal.logging.MetricsLogger;
		import com.android.internal.logging.MetricsProto.MetricsEvent;
		import java.util.List;

		/**
		* A class to keep track of the authentication state for a given client.
		*/
		@@ -50,6 +62,54 @@ public abstract class AuthenticationClient extends ClientMonitor {
		boolean result = false;
		boolean authenticated = fingerId != 0;

		// Ensure authentication only succeeds if the client activity is on top or is keyguard.
		boolean isBackgroundAuth = false;
		if (authenticated && !isKeyguard(getContext(), getOwnerString())) {
		final ActivityManager activityManager =
		(ActivityManager) getContext().getSystemService(Context.ACTIVITY_SERVICE);
		final IActivityManager activityManagerService = activityManager != null
		? ActivityManagerNative.getDefault()
		: null;
		if (activityManagerService == null) {
		Slog.e(TAG, "Unable to get activity manager service");
		isBackgroundAuth = true;
		} else {
		try {
		final List<ActivityManager.RunningTaskInfo> tasks =
		activityManagerService.getTasks(1, 0 /* flags */);
		if (tasks == null \|\| tasks.isEmpty()) {
		Slog.e(TAG, "No running tasks reported");
		isBackgroundAuth = true;
		} else {
		final ComponentName topActivity = tasks.get(0).topActivity;
		if (topActivity == null) {
		Slog.e(TAG, "Unable to get top activity");
		isBackgroundAuth = true;
		} else {
		final String topPackage = topActivity.getPackageName();
		if (!topPackage.contentEquals(getOwnerString())) {
		Slog.e(TAG, "Background authentication detected, top: " + topPackage
		+ ", client: " + this);
		isBackgroundAuth = true;
		}
		}
		}
		} catch (RemoteException e) {
		Slog.e(TAG, "Unable to get running tasks", e);
		isBackgroundAuth = true;
		}
		}
		}
		// Fail authentication if we can't confirm the client activity is on top.
		if (isBackgroundAuth) {
		Slog.e(TAG, "Failing possible background authentication");
		authenticated = false;
		// SafetyNet logging for exploitation attempts of b/159249069.
		final ApplicationInfo appInfo = getContext().getApplicationInfo();
		EventLog.writeEvent(0x534e4554, "159249069", appInfo != null ? appInfo.uid : -1,
		"Attempted background authentication");
		}

		IFingerprintServiceReceiver receiver = getReceiver();
		if (receiver != null) {
		try {
		@@ -58,6 +118,13 @@ public abstract class AuthenticationClient extends ClientMonitor {
		if (!authenticated) {
		receiver.onAuthenticationFailed(getHalDeviceId());
		} else {
		// SafetyNet logging for b/159249069 if constraint is violated.
		if (isBackgroundAuth) {
		final ApplicationInfo appInfo = getContext().getApplicationInfo();
		EventLog.writeEvent(0x534e4554, "159249069",
		appInfo != null ? appInfo.uid : -1,
		"Successful background authentication! Receiver notified");
		}
		if (DEBUG) {
		Slog.v(TAG, "onAuthenticated(owner=" + getOwnerString()
		+ ", id=" + fingerId + ", gp=" + groupId + ")");
		@@ -92,6 +159,12 @@ public abstract class AuthenticationClient extends ClientMonitor {
		}
		result \|= inLockoutMode;
		} else {
		if (isBackgroundAuth) {
		final ApplicationInfo appInfo = getContext().getApplicationInfo();
		EventLog.writeEvent(0x534e4554, "159249069",
		appInfo != null ? appInfo.uid : -1,
		"Successful background authentication! Lockout reset");
		}
		if (receiver != null) {
		FingerprintUtils.vibrateFingerprintSuccess(getContext());
		}
		@@ -101,6 +174,16 @@ public abstract class AuthenticationClient extends ClientMonitor {
		return result;
		}

		private static boolean isKeyguard(Context context, String clientPackage) {
		final boolean hasPermission = context.checkCallingOrSelfPermission(USE_FINGERPRINT)
		== PackageManager.PERMISSION_GRANTED;
		final ComponentName keyguardComponent = ComponentName.unflattenFromString(
		context.getResources().getString(R.string.config_keyguardComponent));
		final String keyguardPackage = keyguardComponent != null
		? keyguardComponent.getPackageName() : null;
		return hasPermission && keyguardPackage != null && keyguardPackage.equals(clientPackage);
		}

		/**
		* Start authentication
		*/