Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a414ba3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Set pinner.pin_camera default to true." into sc-dev am: 8303d7d9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15061671

Change-Id: I7e34263bbb4605de4a3473c9ccb81abda67f66b6
parents 5cca2127 8303d7d9

services/core/java/com/android/server/PinnerService.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -517,7 +517,7 @@ public final class PinnerService extends SystemService { 
        boolean shouldPinCamera = mConfiguredToPinCamera

        boolean shouldPinCamera = mConfiguredToPinCamera

                && DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_RUNTIME_NATIVE_BOOT,

                && DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_RUNTIME_NATIVE_BOOT,

                        "pin_camera",

                        "pin_camera",

                        SystemProperties.getBoolean("pinner.pin_camera", false));

                        SystemProperties.getBoolean("pinner.pin_camera", true));

        if (shouldPinCamera) {

        if (shouldPinCamera) {

            pinKeys.add(KEY_CAMERA);

            pinKeys.add(KEY_CAMERA);

        } else if (DEBUG) {

        } else if (DEBUG) {