Merge "Flip order of arguments" (cc25afe0) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -32995,7 +32995,7 @@ package android.os {
		method public android.os.StrictMode.ThreadPolicy.Builder penaltyDialog();
		method public android.os.StrictMode.ThreadPolicy.Builder penaltyDropBox();
		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 permitAll();
		method public android.os.StrictMode.ThreadPolicy.Builder permitCustomSlowCalls();
		@@ -33027,7 +33027,7 @@ package android.os {
		method public android.os.StrictMode.VmPolicy.Builder penaltyDeathOnCleartextNetwork();
		method public android.os.StrictMode.VmPolicy.Builder penaltyDeathOnFileUriExposure();
		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 setClassInstanceLimit(java.lang.Class, int);
		}

api/removed.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -257,6 +257,14 @@ package android.os {
		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 {
		method public static java.time.Clock elapsedRealtimeClock();
		method public static java.time.Clock uptimeClock();

core/java/android/os/StrictMode.java

+14 −2

Original line number	Diff line number	Diff line
		@@ -636,7 +636,7 @@ public final class StrictMode {
		* executor every violation.
		*/
		public Builder penaltyListener(
		@NonNull OnThreadViolationListener listener, @NonNull Executor executor) {
		@NonNull Executor executor, @NonNull OnThreadViolationListener listener) {
		if (executor == null) {
		throw new NullPointerException("executor must not be null");
		}
		@@ -645,6 +645,12 @@ public final class StrictMode {
		return this;
		}

		/** @removed */
		public Builder penaltyListener(
		@NonNull OnThreadViolationListener listener, @NonNull Executor executor) {
		return penaltyListener(executor, listener);
		}

		private Builder enable(int bit) {
		mMask \|= bit;
		return this;
		@@ -971,7 +977,7 @@ public final class StrictMode {
		* Call #{@link OnVmViolationListener#onVmViolation(Violation)} on every violation.
		*/
		public Builder penaltyListener(
		@NonNull OnVmViolationListener listener, @NonNull Executor executor) {
		@NonNull Executor executor, @NonNull OnVmViolationListener listener) {
		if (executor == null) {
		throw new NullPointerException("executor must not be null");
		}
		@@ -980,6 +986,12 @@ public final class StrictMode {
		return this;
		}

		/** @removed */
		public Builder penaltyListener(
		@NonNull OnVmViolationListener listener, @NonNull Executor executor) {
		return penaltyListener(executor, listener);
		}

		private Builder enable(int bit) {
		mMask \|= bit;
		return this;