Merge "Fix deadlock when notifying emergency state change" into main (5d1637c9) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/location/injector/SystemEmergencyHelper.java

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -76,11 +76,12 @@ public class SystemEmergencyHelper extends EmergencyHelper {
	try {		try {
	mIsInEmergencyCall = mTelephonyManager.isEmergencyNumber(		mIsInEmergencyCall = mTelephonyManager.isEmergencyNumber(
	intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER));		intent.getStringExtra(Intent.EXTRA_PHONE_NUMBER));
	dispatchEmergencyStateChanged();
	} catch (IllegalStateException \| UnsupportedOperationException e) {		} catch (IllegalStateException \| UnsupportedOperationException e) {
	Log.w(TAG, "Failed to call TelephonyManager.isEmergencyNumber().", e);		Log.w(TAG, "Failed to call TelephonyManager.isEmergencyNumber().", e);
	}		}
	}		}

			dispatchEmergencyStateChanged();
	}		}
	}, new IntentFilter(Intent.ACTION_NEW_OUTGOING_CALL));		}, new IntentFilter(Intent.ACTION_NEW_OUTGOING_CALL));

	@@ -140,9 +141,10 @@ public class SystemEmergencyHelper extends EmergencyHelper {
	if (mIsInEmergencyCall) {		if (mIsInEmergencyCall) {
	mEmergencyCallEndRealtimeMs = SystemClock.elapsedRealtime();		mEmergencyCallEndRealtimeMs = SystemClock.elapsedRealtime();
	mIsInEmergencyCall = false;		mIsInEmergencyCall = false;
	dispatchEmergencyStateChanged();
	}		}
	}		}

			dispatchEmergencyStateChanged();
	}		}
	}		}
	}		}