Merge "DO NOT MERGE" into qt-qpr1-dev
diff --git a/src/com/android/settings/core/SettingsBaseActivity.java b/src/com/android/settings/core/SettingsBaseActivity.java
index 6e37b16..993c9b0 100644
--- a/src/com/android/settings/core/SettingsBaseActivity.java
+++ b/src/com/android/settings/core/SettingsBaseActivity.java
@@ -63,7 +63,7 @@
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- if (isLockTaskModePinned() && !isSettingsRunOnTop()) {
+ if (isLockTaskModePinned() && !isSettingsRunOnTop() && !isLaunchableInTaskModePinned()) {
Log.w(TAG, "Devices lock task mode pinned.");
finish();
}
@@ -147,6 +147,13 @@
((ViewGroup) findViewById(R.id.content_frame)).addView(view, params);
}
+ /**
+ * @return whether or not the activity can be launched from other apps in the pinning screen.
+ */
+ public boolean isLaunchableInTaskModePinned() {
+ return false;
+ }
+
private void onCategoriesChanged() {
final int N = mCategoryListeners.size();
for (int i = 0; i < N; i++) {
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
index 5407776..e797bee 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
@@ -188,6 +188,11 @@
}
}
+ @Override
+ public boolean isLaunchableInTaskModePinned() {
+ return true;
+ }
+
public void prepareEnterAnimation() {
getFragment().prepareEnterAnimation();
}
diff --git a/src/com/android/settings/password/PasswordUtils.java b/src/com/android/settings/password/PasswordUtils.java
index 1ead492..5b75033 100644
--- a/src/com/android/settings/password/PasswordUtils.java
+++ b/src/com/android/settings/password/PasswordUtils.java
@@ -89,7 +89,8 @@
/* initialPid= */ -1,
getCallingAppPackageName(activityToken),
userId,
- message);
+ message,
+ false);
} catch (RemoteException e) {
Log.v(TAG, "Could not talk to activity manager.", e);
}