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

packages/VpnDialogs/AndroidManifest.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@

		<uses-permission android:name="android.permission.CONTROL_VPN" />
		<uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />
		<uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/>

		<application android:label="VpnDialogs"
		android:allowBackup="false" >

packages/VpnDialogs/src/com/android/vpndialogs/ConfirmDialog.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.vpndialogs;

		import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;

		import android.content.Context;
		import android.content.DialogInterface;
		import android.content.pm.PackageManager;
		@@ -78,6 +80,7 @@ public class ConfirmDialog extends AlertActivity
		setupAlert();

		getWindow().setCloseOnTouchOutside(false);
		getWindow().addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
		Button button = mAlert.getButton(DialogInterface.BUTTON_POSITIVE);
		button.setFilterTouchesWhenObscured(true);
		}

services/core/java/com/android/server/am/ActivityStackSupervisor.java

+20 −12

Original line number	Diff line number	Diff line
		@@ -3987,19 +3987,12 @@ public final class ActivityStackSupervisor implements DisplayListener {
		mLockTaskNotify = new LockTaskNotify(mService.mContext);
		}
		mLockTaskNotify.show(false);
		try {
		boolean shouldLockKeyguard = Settings.Secure.getInt(
		mService.mContext.getContentResolver(),
		Settings.Secure.LOCK_TO_APP_EXIT_LOCKED) != 0;
		if (mLockTaskModeState == LOCK_TASK_MODE_PINNED && shouldLockKeyguard) {
		if (mLockTaskModeState == LOCK_TASK_MODE_PINNED && shouldLockKeyguard()) {
		mWindowManager.lockNow(null);
		mWindowManager.dismissKeyguard();
		new LockPatternUtils(mService.mContext)
		.requireCredentialEntry(UserHandle.USER_ALL);
		}
		} catch (SettingNotFoundException e) {
		// No setting, don't lock.
		}
		} catch (RemoteException ex) {
		throw new RuntimeException(ex);
		} finally {
		@@ -4035,6 +4028,21 @@ public final class ActivityStackSupervisor implements DisplayListener {
		}
		}

		private boolean shouldLockKeyguard() {
		// This functionality should be kept consistent with
		// com.android.settings.security.ScreenPinningSettings (see b/127605586)
		try {
		return Settings.Secure.getInt(
		mService.mContext.getContentResolver(),
		Settings.Secure.LOCK_TO_APP_EXIT_LOCKED) != 0;
		} catch (Settings.SettingNotFoundException e) {
		// Log to SafetyNet for b/127605586
		android.util.EventLog.writeEvent(0x534e4554, "127605586", -1, "");
		LockPatternUtils lockPatternUtils = new LockPatternUtils(mService.mContext);
		return lockPatternUtils.isSecure(mCurrentUser);
		}
		}

		class ActivityContainer extends android.app.IActivityContainer.Stub {
		final static int FORCE_NEW_TASK_FLAGS = FLAG_ACTIVITY_NEW_TASK \|
		FLAG_ACTIVITY_MULTIPLE_TASK \| Intent.FLAG_ACTIVITY_NO_ANIMATION;