am 1bd7d5e4: am 675814d4: Merge "Maybe fix issue #7596986: Frequent runtime... (7b1af760) · Commits · e / os / android_frameworks_base

services/java/com/android/server/LocationManagerService.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -531,7 +531,7 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
		synchronized (this) {
		// synchronize to ensure incrementPendingBroadcastsLocked()
		// is called before decrementPendingBroadcasts()
		mListener.onLocationChanged(location);
		mListener.onLocationChanged(new Location(location));
		// call this after broadcasting so we do not increment
		// if we throw an exeption.
		incrementPendingBroadcastsLocked();
		@@ -1323,10 +1323,10 @@ public class LocationManagerService extends ILocationManager.Stub implements Run
		if (allowedResolutionLevel < RESOLUTION_LEVEL_FINE) {
		Location noGPSLocation = location.getExtraLocation(Location.EXTRA_NO_GPS_LOCATION);
		if (noGPSLocation != null) {
		return mLocationFudger.getOrCreate(noGPSLocation);
		return new Location(mLocationFudger.getOrCreate(noGPSLocation));
		}
		} else {
		return location;
		return new Location(location);
		}
		}
		return null;

+16 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ import android.os.RemoteException;
		import android.os.SystemClock;
		import android.os.UserHandle;
		import android.util.EventLog;
		import android.util.Log;
		import android.util.Slog;

		/**
		@@ -779,6 +780,21 @@ public class BroadcastQueue {
		} catch (RemoteException e) {
		Slog.w(TAG, "Exception when sending broadcast to "
		+ r.curComponent, e);
		} catch (RuntimeException e) {
		Log.wtf(TAG, "Failed sending broadcast to "
		+ r.curComponent + " with " + r.intent, e);
		// If some unexpected exception happened, just skip
		// this broadcast. At this point we are not in the call
		// from a client, so throwing an exception out from here
		// will crash the entire system instead of just whoever
		// sent the broadcast.
		logBroadcastReceiverDiscardLocked(r);
		finishReceiverLocked(r, r.resultCode, r.resultData,
		r.resultExtras, r.resultAbort, true);
		scheduleBroadcastsLocked();
		// We need to reset the state if we failed to start the receiver.
		r.state = BroadcastRecord.IDLE;
		return;
		}

		// If a dead object exception was thrown -- fall through to