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

Commit 2307eda0 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5928451 from e9c81c3e to qt-qpr2-release 

Change-Id: I5cec37ac0e39248d46ba2818723a3d8bca63f193
parents 255d5a72 e9c81c3e

core/java/android/os/Build.java

+2 −1
Original line number Diff line number Diff line
@@ -243,7 +243,8 @@ public class Build { 
        public static final String BASE_OS = SystemProperties.get("ro.build.version.base_os", "");



        /**

         * The user-visible security patch level.

         * The user-visible security patch level. This value represents the date when the device

         * most recently applied a security patch.

         */

        public static final String SECURITY_PATCH = SystemProperties.get(

                "ro.build.version.security_patch", "");

services/core/java/com/android/server/notification/NotificationManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -1450,7 +1450,7 @@ public class NotificationManagerService extends SystemService { 
            } else {

                // Secure => Global

                Settings.Secure.putInt(resolver,

                        Settings.Secure.NOTIFICATION_BADGING,

                        Settings.Secure.NOTIFICATION_BUBBLES,

                        globalSettingValue);

            }

        }