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

Commit 6fb8fe9a authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by android code review
Browse files

Merge "StrictMode.permitCustomSlowCalls() should call disable(DETECT_CUSTOM)"

parents 52410be8 097fbf2e

core/java/android/os/StrictMode.java

+3 −3
Original line number Diff line number Diff line
@@ -407,17 +407,17 @@ public final class StrictMode { 
            }



            /**

             * Enable detection of disk reads.

             * Enable detection of slow calls.

             */

            public Builder detectCustomSlowCalls() {

                return enable(DETECT_CUSTOM);

            }



            /**

             * Enable detection of disk reads.

             * Disable detection of slow calls.

             */

            public Builder permitCustomSlowCalls() {

                return enable(DETECT_CUSTOM);

                return disable(DETECT_CUSTOM);

            }



            /**