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

Commit 72534b7e authored by Kurt Nelson's avatar Kurt Nelson
Browse files

Flip order of arguments 

Callbacks as the second parameter is more Kotlin friendly.

Bug: 73751206
Test: cts-tradefed run commandAndExit cts-dev --module CtsOsTestCases --test android.os.cts.StrictModeTest
Change-Id: Ib9c9469be1b81dc65e74c9e303f474c54a43b18b
parent e406ac08

api/current.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -32987,7 +32987,7 @@ package android.os { 
    method public android.os.StrictMode.ThreadPolicy.Builder penaltyDialog();

    method public android.os.StrictMode.ThreadPolicy.Builder penaltyDialog();

    method public android.os.StrictMode.ThreadPolicy.Builder penaltyDropBox();

    method public android.os.StrictMode.ThreadPolicy.Builder penaltyDropBox();

    method public android.os.StrictMode.ThreadPolicy.Builder penaltyFlashScreen();

    method public android.os.StrictMode.ThreadPolicy.Builder penaltyFlashScreen();

    method public android.os.StrictMode.ThreadPolicy.Builder penaltyListener(android.os.StrictMode.OnThreadViolationListener, java.util.concurrent.Executor);

    method public android.os.StrictMode.ThreadPolicy.Builder penaltyListener(java.util.concurrent.Executor, android.os.StrictMode.OnThreadViolationListener);

    method public android.os.StrictMode.ThreadPolicy.Builder penaltyLog();

    method public android.os.StrictMode.ThreadPolicy.Builder penaltyLog();

    method public android.os.StrictMode.ThreadPolicy.Builder permitAll();

    method public android.os.StrictMode.ThreadPolicy.Builder permitAll();

    method public android.os.StrictMode.ThreadPolicy.Builder permitCustomSlowCalls();

    method public android.os.StrictMode.ThreadPolicy.Builder permitCustomSlowCalls();
@@ -33019,7 +33019,7 @@ package android.os { 
    method public android.os.StrictMode.VmPolicy.Builder penaltyDeathOnCleartextNetwork();

    method public android.os.StrictMode.VmPolicy.Builder penaltyDeathOnCleartextNetwork();

    method public android.os.StrictMode.VmPolicy.Builder penaltyDeathOnFileUriExposure();

    method public android.os.StrictMode.VmPolicy.Builder penaltyDeathOnFileUriExposure();

    method public android.os.StrictMode.VmPolicy.Builder penaltyDropBox();

    method public android.os.StrictMode.VmPolicy.Builder penaltyDropBox();

    method public android.os.StrictMode.VmPolicy.Builder penaltyListener(android.os.StrictMode.OnVmViolationListener, java.util.concurrent.Executor);

    method public android.os.StrictMode.VmPolicy.Builder penaltyListener(java.util.concurrent.Executor, android.os.StrictMode.OnVmViolationListener);

    method public android.os.StrictMode.VmPolicy.Builder penaltyLog();

    method public android.os.StrictMode.VmPolicy.Builder penaltyLog();

    method public android.os.StrictMode.VmPolicy.Builder setClassInstanceLimit(java.lang.Class, int);

    method public android.os.StrictMode.VmPolicy.Builder setClassInstanceLimit(java.lang.Class, int);

  }

  }

api/removed.txt

+8 −0
Original line number Original line Diff line number Diff line
@@ -257,6 +257,14 @@ package android.os { 
    ctor public RecoverySystem();

    ctor public RecoverySystem();

  }

  }





  public static final class StrictMode.ThreadPolicy.Builder {

    method public android.os.StrictMode.ThreadPolicy.Builder penaltyListener(android.os.StrictMode.OnThreadViolationListener, java.util.concurrent.Executor);

  }



  public static final class StrictMode.VmPolicy.Builder {

    method public android.os.StrictMode.VmPolicy.Builder penaltyListener(android.os.StrictMode.OnVmViolationListener, java.util.concurrent.Executor);

  }



  public final class SystemClock {

  public final class SystemClock {

    method public static java.time.Clock elapsedRealtimeClock();

    method public static java.time.Clock elapsedRealtimeClock();

    method public static java.time.Clock uptimeClock();

    method public static java.time.Clock uptimeClock();

core/java/android/os/StrictMode.java

+14 −2
Original line number Original line Diff line number Diff line
@@ -636,7 +636,7 @@ public final class StrictMode { 
             * executor every violation.

             * executor every violation.

             */

             */

            public Builder penaltyListener(

            public Builder penaltyListener(

                    @NonNull OnThreadViolationListener listener, @NonNull Executor executor) {

                    @NonNull Executor executor, @NonNull OnThreadViolationListener listener) {

                if (executor == null) {

                if (executor == null) {

                    throw new NullPointerException("executor must not be null");

                    throw new NullPointerException("executor must not be null");

                }

                }
@@ -645,6 +645,12 @@ public final class StrictMode { 
                return this;

                return this;

            }

            }





            /** @removed */

            public Builder penaltyListener(

                    @NonNull OnThreadViolationListener listener, @NonNull Executor executor) {

                return penaltyListener(executor, listener);

            }



            private Builder enable(int bit) {

            private Builder enable(int bit) {

                mMask |= bit;

                mMask |= bit;

                return this;

                return this;
@@ -971,7 +977,7 @@ public final class StrictMode { 
             * Call #{@link OnVmViolationListener#onVmViolation(Violation)} on every violation.

             * Call #{@link OnVmViolationListener#onVmViolation(Violation)} on every violation.

             */

             */

            public Builder penaltyListener(

            public Builder penaltyListener(

                    @NonNull OnVmViolationListener listener, @NonNull Executor executor) {

                    @NonNull Executor executor, @NonNull OnVmViolationListener listener) {

                if (executor == null) {

                if (executor == null) {

                    throw new NullPointerException("executor must not be null");

                    throw new NullPointerException("executor must not be null");

                }

                }
@@ -980,6 +986,12 @@ public final class StrictMode { 
                return this;

                return this;

            }

            }





            /** @removed */

            public Builder penaltyListener(

                    @NonNull OnVmViolationListener listener, @NonNull Executor executor) {

                return penaltyListener(executor, listener);

            }



            private Builder enable(int bit) {

            private Builder enable(int bit) {

                mMask |= bit;

                mMask |= bit;

                return this;

                return this;