commit 30a9392b21b99139377c692ac8d900a8253489eb
author TreeHugger Robot <treehugger-gerrit@google.com> Fri May 10 00:27:34 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 10 00:27:34 2019 +0000
tree 023631a0a4193e769b24cf31cc4e8ead24bb55da
parent b0f641869bbb6f7ff893058b5d2a81f49c59e50e
parent d2eae19d4cc2f5333326a9943c27d435cacbae6f

Merge "Clean up homepage toolbar after setting transparent navbar." into qt-dev

src/com/android/settings/media/MediaOutputSlice.java

diff --git a/src/com/android/settings/media/MediaOutputSlice.java b/src/com/android/settings/media/MediaOutputSlice.java
index dee5d62..96f8bc3 100644
--- a/src/com/android/settings/media/MediaOutputSlice.java
+++ b/src/com/android/settings/media/MediaOutputSlice.java
@@ -90,10 +90,13 @@
         final List<MediaDevice> devices = getMediaDevices();
 
         final MediaDevice connectedDevice = getWorker().getCurrentConnectedMediaDevice();
-        listBuilder.addRow(getActiveDeviceHeaderRow(connectedDevice));
+        if (connectedDevice != null) {
+            listBuilder.addRow(getActiveDeviceHeaderRow(connectedDevice));
+        }
 
         for (MediaDevice device : devices) {
-            if (!TextUtils.equals(connectedDevice.getId(), device.getId())) {
+            if (connectedDevice == null
+                    || !TextUtils.equals(connectedDevice.getId(), device.getId())) {
                 listBuilder.addRow(getMediaDeviceRow(device));
             }
         }

src/com/android/settings/security/ScreenPinningSettings.java

diff --git a/src/com/android/settings/security/ScreenPinningSettings.java b/src/com/android/settings/security/ScreenPinningSettings.java
index 22223fd..c60fd47 100644
--- a/src/com/android/settings/security/ScreenPinningSettings.java
+++ b/src/com/android/settings/security/ScreenPinningSettings.java
@@ -117,9 +117,13 @@
     }
 
     private boolean isScreenLockUsed() {
-        int def = getCurrentSecurityTitle() != R.string.screen_pinning_unlock_none ? 1 : 0;
-        return Settings.Secure.getInt(getContentResolver(),
-                Settings.Secure.LOCK_TO_APP_EXIT_LOCKED, def) != 0;
+        // This functionality should be kept consistent with
+        // com.android.server.wm.LockTaskController (see b/127605586)
+        int defaultValueIfSettingNull = mLockPatternUtils.isSecure(UserHandle.myUserId()) ? 1 : 0;
+        return Settings.Secure.getInt(
+                getContentResolver(),
+                Settings.Secure.LOCK_TO_APP_EXIT_LOCKED,
+                defaultValueIfSettingNull) != 0;
     }
 
     private boolean setScreenLockUsed(boolean isEnabled) {