DO NOT MERGE - Merge pie-platform-release (PPRL.190801.002) into master (21cb5989) · Commits · e / os / android_packages_services_Telecomm

src/com/android/server/telecom/TelecomServiceImpl.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -1779,6 +1779,11 @@ public class TelecomServiceImpl {
		}

		if (call != null) {
		if (call.isEmergencyCall()) {
		android.util.EventLog.writeEvent(0x534e4554, "132438333", -1, "");
		return false;
		}

		if (call.getState() == CallState.RINGING) {
		call.reject(false /* rejectWithMessage */, null, callingPackage);
		} else {

+19 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.server.telecom.components;

		import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;

		import android.content.Context;
		import android.content.DialogInterface;
		import android.content.pm.ApplicationInfo;
		@@ -34,6 +36,8 @@ import android.text.TextUtils;
		import android.text.style.ForegroundColorSpan;
		import android.text.style.StyleSpan;
		import android.util.Log;
		import android.view.WindowManager;
		import android.view.Window;

		import com.android.internal.app.AlertActivity;
		import com.android.internal.app.AlertController;
		@@ -80,6 +84,21 @@ public class ChangeDefaultDialerDialog extends AlertActivity implements
		}
		}

		@Override
		public void onStart() {
		super.onStart();
		getWindow().addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);
		}

		@Override
		public void onStop() {
		final Window window = getWindow();
		final WindowManager.LayoutParams attrs = window.getAttributes();
		attrs.privateFlags &= ~PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
		window.setAttributes(attrs);
		super.onStop();
		}

		private boolean canChangeToProvidedPackage(String oldPackage, String newPackage) {
		final TelephonyManager tm = (TelephonyManager)getSystemService(Context.TELEPHONY_SERVICE);
		if (!tm.isVoiceCapable()) {