commit 9c045fe697ba49ee39e44dd6f5dd7409464ea70e
author Evan Laird <evanlaird@google.com> Mon Nov 12 17:47:29 2018 -0800
committer android-build-merger <android-build-merger@google.com> Mon Nov 12 17:47:29 2018 -0800
tree e85fb8ffe20cb3330db768b8b46f9cd4c500f00b
parent e7b2078fff8e9ead8c89fc916c7dee00e4f76503
parent 9614b0b40f40289c7f2d365c8488d3677d715ec9

Merge "[StatusBar] fix: Make DisableRecord.pkg working" am: e4b0e8dc7a am: b773344800
am: 9614b0b40f

Change-Id: I0e8db72a01de7c3534ec10215ee1277e95a482aa

services/core/java/com/android/server/statusbar/StatusBarManagerService.java

diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
index 79eab6b..ec78560 100644
--- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
+++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
@@ -140,13 +140,14 @@
             switch (which) {
                 case 1:
                     what1 = what;
-                    return;
+                    break;
                 case 2:
                     what2 = what;
-                    return;
+                    break;
                 default:
                     Slog.w(TAG, "Can't set unsupported disable flag " + which
                             + ": 0x" + Integer.toHexString(what));
+                    break;
             }
             this.pkg = pkg;
         }