feat:2398: MR coderabits suggestions. (61a025d2) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/location/FakeLocationResolver.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import android.location.LocationResult;
		import android.location.util.identity.CallerIdentity;
		import android.net.Uri;
		import android.os.Bundle;
		import android.telecom.Call;
		import android.util.Log;

		import java.util.ArrayList;
		@@ -47,7 +46,7 @@ public class FakeLocationResolver {
		final int uid = identity.getUid();
		final String packageName = identity.getPackageName();

		if (baseLocations == null \|\| context == null \|\| packageName == null \|\| uid < 0) {
		if (baseLocations == null \|\| packageName == null \|\| uid < 0) {
		Log.w(TAG, "FakeLocationResolver::fakeLocations invalid parameters");
		return baseLocations;
		}
		@@ -64,7 +63,7 @@ public class FakeLocationResolver {
		final int uid = identity.getUid();
		final String packageName = identity.getPackageName();

		if (baseLocation == null \|\| context == null \|\| packageName == null \|\| uid < 0) {
		if (baseLocation == null \|\| packageName == null \|\| uid < 0) {
		Log.w(TAG, "FakeLocationResolver::fakeLocation invalid parameters");
		return baseLocation;
		}
		@@ -78,7 +77,7 @@ public class FakeLocationResolver {
		final int uid = identity.getUid();
		final String packageName = identity.getPackageName();

		if (context == null \|\| packageName == null \|\| uid < 0) {
		if (packageName == null \|\| uid < 0) {
		Log.w(TAG, "FakeLocationResolver::hasFakeLocation invalid parameters");
		return false;
		}
		@@ -113,7 +112,7 @@ public class FakeLocationResolver {
		return new FakeLocation(result.getDouble(PARAM_LATITUDE), result.getDouble(PARAM_LONGITUDE));
		}
		} catch(Exception e) {
		Log.w("AP-FakeLocation", "Can't getFakeLocation", e);
		Log.w(TAG, "Can't getFakeLocation", e);
		}
		return null;
		}