Merge "Replace com.android.internal.util.Preconditions.checkNotNull with... (56dc6a4b) · Commits · e / os / android_frameworks_base

core/java/android/hardware/hdmi/HdmiControlManager.java

+9 −9

Original line number	Diff line number	Diff line
		@@ -36,10 +36,10 @@ import android.util.ArrayMap;
		import android.util.Log;

		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.util.Preconditions;

		import java.util.ArrayList;
		import java.util.List;
		import java.util.Objects;

		/**
		* The {@link HdmiControlManager} class is used to send HDMI control messages
		@@ -532,7 +532,7 @@ public final class HdmiControlManager {
		*/
		@SystemApi
		public void powerOffDevice(@NonNull HdmiDeviceInfo deviceInfo) {
		Preconditions.checkNotNull(deviceInfo);
		Objects.requireNonNull(deviceInfo);
		try {
		mService.powerOffRemoteDevice(
		deviceInfo.getLogicalAddress(), deviceInfo.getDevicePowerStatus());
		@@ -549,7 +549,7 @@ public final class HdmiControlManager {
		@Deprecated
		@SystemApi
		public void powerOffRemoteDevice(@NonNull HdmiDeviceInfo deviceInfo) {
		Preconditions.checkNotNull(deviceInfo);
		Objects.requireNonNull(deviceInfo);
		try {
		mService.powerOffRemoteDevice(
		deviceInfo.getLogicalAddress(), deviceInfo.getDevicePowerStatus());
		@@ -569,7 +569,7 @@ public final class HdmiControlManager {
		* @hide
		*/
		public void powerOnDevice(HdmiDeviceInfo deviceInfo) {
		Preconditions.checkNotNull(deviceInfo);
		Objects.requireNonNull(deviceInfo);
		try {
		mService.powerOnRemoteDevice(
		deviceInfo.getLogicalAddress(), deviceInfo.getDevicePowerStatus());
		@@ -586,7 +586,7 @@ public final class HdmiControlManager {
		@Deprecated
		@SystemApi
		public void powerOnRemoteDevice(HdmiDeviceInfo deviceInfo) {
		Preconditions.checkNotNull(deviceInfo);
		Objects.requireNonNull(deviceInfo);
		try {
		mService.powerOnRemoteDevice(
		deviceInfo.getLogicalAddress(), deviceInfo.getDevicePowerStatus());
		@@ -610,7 +610,7 @@ public final class HdmiControlManager {
		*/
		@SystemApi
		public void setActiveSource(@NonNull HdmiDeviceInfo deviceInfo) {
		Preconditions.checkNotNull(deviceInfo);
		Objects.requireNonNull(deviceInfo);
		try {
		mService.askRemoteDeviceToBecomeActiveSource(deviceInfo.getPhysicalAddress());
		} catch (RemoteException e) {
		@@ -626,7 +626,7 @@ public final class HdmiControlManager {
		@Deprecated
		@SystemApi
		public void requestRemoteDeviceToBecomeActiveSource(@NonNull HdmiDeviceInfo deviceInfo) {
		Preconditions.checkNotNull(deviceInfo);
		Objects.requireNonNull(deviceInfo);
		try {
		mService.askRemoteDeviceToBecomeActiveSource(deviceInfo.getPhysicalAddress());
		} catch (RemoteException e) {
		@@ -689,7 +689,7 @@ public final class HdmiControlManager {
		*/
		@SystemApi
		public boolean isDeviceConnected(@NonNull HdmiDeviceInfo targetDevice) {
		Preconditions.checkNotNull(targetDevice);
		Objects.requireNonNull(targetDevice);
		int physicalAddress = getLocalPhysicalAddress();
		if (physicalAddress == INVALID_PHYSICAL_ADDRESS) {
		return false;
		@@ -710,7 +710,7 @@ public final class HdmiControlManager {
		@Deprecated
		@SystemApi
		public boolean isRemoteDeviceConnected(@NonNull HdmiDeviceInfo targetDevice) {
		Preconditions.checkNotNull(targetDevice);
		Objects.requireNonNull(targetDevice);
		int physicalAddress = getLocalPhysicalAddress();
		if (physicalAddress == INVALID_PHYSICAL_ADDRESS) {
		return false;

core/java/android/hardware/hdmi/HdmiSwitchClient.java

+5 −6

Original line number	Diff line number	Diff line
		@@ -23,10 +23,9 @@ import android.os.Binder;
		import android.os.RemoteException;
		import android.util.Log;

		import com.android.internal.util.Preconditions;

		import java.util.Collections;
		import java.util.List;
		import java.util.Objects;
		import java.util.concurrent.Executor;

		/**
		@@ -70,7 +69,7 @@ public class HdmiSwitchClient extends HdmiClient {
		* @hide
		*/
		public void selectDevice(int logicalAddress, @NonNull OnSelectListener listener) {
		Preconditions.checkNotNull(listener);
		Objects.requireNonNull(listener);
		try {
		mService.deviceSelect(logicalAddress, getCallbackWrapper(listener));
		} catch (RemoteException e) {
		@@ -91,7 +90,7 @@ public class HdmiSwitchClient extends HdmiClient {
		*/
		@SystemApi
		public void selectPort(int portId, @NonNull OnSelectListener listener) {
		Preconditions.checkNotNull(listener);
		Objects.requireNonNull(listener);
		try {
		mService.portSelect(portId, getCallbackWrapper(listener));
		} catch (RemoteException e) {
		@@ -114,7 +113,7 @@ public class HdmiSwitchClient extends HdmiClient {
		int logicalAddress,
		@NonNull @CallbackExecutor Executor executor,
		@NonNull OnSelectListener listener) {
		Preconditions.checkNotNull(listener);
		Objects.requireNonNull(listener);
		try {
		mService.deviceSelect(logicalAddress,
		new IHdmiControlCallback.Stub() {
		@@ -146,7 +145,7 @@ public class HdmiSwitchClient extends HdmiClient {
		int portId,
		@NonNull @CallbackExecutor Executor executor,
		@NonNull OnSelectListener listener) {
		Preconditions.checkNotNull(listener);
		Objects.requireNonNull(listener);
		try {
		mService.portSelect(portId,
		new IHdmiControlCallback.Stub() {

core/java/android/hardware/location/ContextHubClient.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -22,11 +22,10 @@ import android.app.PendingIntent;
		import android.os.RemoteException;
		import android.util.Log;

		import com.android.internal.util.Preconditions;

		import dalvik.system.CloseGuard;

		import java.io.Closeable;
		import java.util.Objects;
		import java.util.concurrent.atomic.AtomicBoolean;

		/**
		@@ -80,7 +79,7 @@ public class ContextHubClient implements Closeable {
		* @param clientProxy the proxy of the client at the service
		*/
		/* package */ void setClientProxy(IContextHubClient clientProxy) {
		Preconditions.checkNotNull(clientProxy, "IContextHubClient cannot be null");
		Objects.requireNonNull(clientProxy, "IContextHubClient cannot be null");
		if (mClientProxy != null) {
		throw new IllegalStateException("Cannot change client proxy multiple times");
		}
		@@ -140,7 +139,7 @@ public class ContextHubClient implements Closeable {
		@RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE)
		@ContextHubTransaction.Result
		public int sendMessageToNanoApp(@NonNull NanoAppMessage message) {
		Preconditions.checkNotNull(message, "NanoAppMessage cannot be null");
		Objects.requireNonNull(message, "NanoAppMessage cannot be null");

		int maxPayloadBytes = mAttachedHub.getMaxPacketLengthBytes();
		byte[] payload = message.getMessageBody();

core/java/android/hardware/location/ContextHubIntentEvent.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ import android.annotation.SystemApi;
		import android.app.PendingIntent;
		import android.content.Intent;

		import com.android.internal.util.Preconditions;
		import java.util.Objects;

		/**
		* A helper class to retrieve information about a Intent event received for a PendingIntent
		@@ -89,7 +89,7 @@ public class ContextHubIntentEvent {
		*/
		@NonNull
		public static ContextHubIntentEvent fromIntent(@NonNull Intent intent) {
		Preconditions.checkNotNull(intent, "Intent cannot be null");
		Objects.requireNonNull(intent, "Intent cannot be null");

		hasExtraOrThrow(intent, ContextHubManager.EXTRA_CONTEXT_HUB_INFO);
		ContextHubInfo info = intent.getParcelableExtra(ContextHubManager.EXTRA_CONTEXT_HUB_INFO);

core/java/android/hardware/location/ContextHubManager.java

+12 −13

Original line number	Diff line number	Diff line
		@@ -34,11 +34,10 @@ import android.os.ServiceManager;
		import android.os.ServiceManager.ServiceNotFoundException;
		import android.util.Log;

		import com.android.internal.util.Preconditions;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;
		import java.util.List;
		import java.util.Objects;
		import java.util.concurrent.Executor;

		/**
		@@ -470,8 +469,8 @@ public final class ContextHubManager {
		@RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE)
		@NonNull public ContextHubTransaction<Void> loadNanoApp(
		@NonNull ContextHubInfo hubInfo, @NonNull NanoAppBinary appBinary) {
		Preconditions.checkNotNull(hubInfo, "ContextHubInfo cannot be null");
		Preconditions.checkNotNull(appBinary, "NanoAppBinary cannot be null");
		Objects.requireNonNull(hubInfo, "ContextHubInfo cannot be null");
		Objects.requireNonNull(appBinary, "NanoAppBinary cannot be null");

		ContextHubTransaction<Void> transaction =
		new ContextHubTransaction<>(ContextHubTransaction.TYPE_LOAD_NANOAPP);
		@@ -499,7 +498,7 @@ public final class ContextHubManager {
		@RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE)
		@NonNull public ContextHubTransaction<Void> unloadNanoApp(
		@NonNull ContextHubInfo hubInfo, long nanoAppId) {
		Preconditions.checkNotNull(hubInfo, "ContextHubInfo cannot be null");
		Objects.requireNonNull(hubInfo, "ContextHubInfo cannot be null");

		ContextHubTransaction<Void> transaction =
		new ContextHubTransaction<>(ContextHubTransaction.TYPE_UNLOAD_NANOAPP);
		@@ -527,7 +526,7 @@ public final class ContextHubManager {
		@RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE)
		@NonNull public ContextHubTransaction<Void> enableNanoApp(
		@NonNull ContextHubInfo hubInfo, long nanoAppId) {
		Preconditions.checkNotNull(hubInfo, "ContextHubInfo cannot be null");
		Objects.requireNonNull(hubInfo, "ContextHubInfo cannot be null");

		ContextHubTransaction<Void> transaction =
		new ContextHubTransaction<>(ContextHubTransaction.TYPE_ENABLE_NANOAPP);
		@@ -555,7 +554,7 @@ public final class ContextHubManager {
		@RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE)
		@NonNull public ContextHubTransaction<Void> disableNanoApp(
		@NonNull ContextHubInfo hubInfo, long nanoAppId) {
		Preconditions.checkNotNull(hubInfo, "ContextHubInfo cannot be null");
		Objects.requireNonNull(hubInfo, "ContextHubInfo cannot be null");

		ContextHubTransaction<Void> transaction =
		new ContextHubTransaction<>(ContextHubTransaction.TYPE_DISABLE_NANOAPP);
		@@ -582,7 +581,7 @@ public final class ContextHubManager {
		@RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE)
		@NonNull public ContextHubTransaction<List<NanoAppState>> queryNanoApps(
		@NonNull ContextHubInfo hubInfo) {
		Preconditions.checkNotNull(hubInfo, "ContextHubInfo cannot be null");
		Objects.requireNonNull(hubInfo, "ContextHubInfo cannot be null");

		ContextHubTransaction<List<NanoAppState>> transaction =
		new ContextHubTransaction<>(ContextHubTransaction.TYPE_QUERY_NANOAPPS);
		@@ -729,9 +728,9 @@ public final class ContextHubManager {
		@NonNull public ContextHubClient createClient(
		@NonNull ContextHubInfo hubInfo, @NonNull ContextHubClientCallback callback,
		@NonNull @CallbackExecutor Executor executor) {
		Preconditions.checkNotNull(callback, "Callback cannot be null");
		Preconditions.checkNotNull(hubInfo, "ContextHubInfo cannot be null");
		Preconditions.checkNotNull(executor, "Executor cannot be null");
		Objects.requireNonNull(callback, "Callback cannot be null");
		Objects.requireNonNull(hubInfo, "ContextHubInfo cannot be null");
		Objects.requireNonNull(executor, "Executor cannot be null");

		ContextHubClient client = new ContextHubClient(hubInfo, false /* persistent */);
		IContextHubClientCallback clientInterface = createClientCallback(
		@@ -808,8 +807,8 @@ public final class ContextHubManager {
		@RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE)
		@NonNull public ContextHubClient createClient(
		@NonNull ContextHubInfo hubInfo, @NonNull PendingIntent pendingIntent, long nanoAppId) {
		Preconditions.checkNotNull(pendingIntent);
		Preconditions.checkNotNull(hubInfo);
		Objects.requireNonNull(pendingIntent);
		Objects.requireNonNull(hubInfo);

		ContextHubClient client = new ContextHubClient(hubInfo, true /* persistent */);