Merge remote-tracking branch 'origin/cm-14.1' into v1-nougat (0a0f0171) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/SettingsActivity.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -539,6 +539,12 @@ public class SettingsActivity extends SettingsDrawerActivity
		@Override
		protected void onCreate(Bundle savedState) {
		super.onCreate(savedState);

		if (isLockTaskModePinned() && !isSettingsRunOnTop()) {
		Log.w(LOG_TAG, "Devices lock task mode pinned.");
		finish();
		}

		long startTime = System.currentTimeMillis();

		// Should happen before any call to getIntent()
		@@ -1358,4 +1364,16 @@ public class SettingsActivity extends SettingsDrawerActivity
		}
		super.onActivityResult(requestCode, resultCode, data);
		}
		private boolean isLockTaskModePinned() {
		final ActivityManager activityManager =
		getApplicationContext().getSystemService(ActivityManager.class);
		return activityManager.getLockTaskModeState() == ActivityManager.LOCK_TASK_MODE_PINNED;
		}
		private boolean isSettingsRunOnTop() {
		final ActivityManager activityManager =
		getApplicationContext().getSystemService(ActivityManager.class);
		final String taskPkgName = activityManager.getRunningTasks(1 /* maxNum */)
		.get(0 /* index */).baseActivity.getPackageName();
		return TextUtils.equals(getPackageName(), taskPkgName);
		}
		}