Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e4befe2 authored Apr 10, 2022 by /e/ robot

Merge remote-tracking branch 'origin/lineage-16.0' into v1-pie

parents 8ee4741a c9e5be6e

AndroidManifest.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,10 @@
		presses home. -->
		<uses-permission android:name="android.permission.STOP_APP_SWITCHES"/>

		<!-- Used for sending PendingIntents to dynamically registered receivers -->
		<uses-permission android:name="com.android.dialer.permission.DIALER_ORIGIN"
		android:protectionLevel="signature" />

		<!-- Permissions needed for badger count showing on launch icon. -->

		<!--for Samsung-->

java/com/android/dialer/app/calllog/CallLogListItemViewHolder.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -568,7 +568,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder
		case CallbackAction.VOICE:
		if (callLogCache.isVoicemailNumber(accountHandle, number)) {
		// Call to generic voicemail number, in case there are multiple accounts
		primaryActionButtonView.setTag(IntentProvider.getReturnVoicemailCallIntentProvider(null));
		primaryActionButtonView.setTag(IntentProvider.getReturnVoicemailCallIntentProvider());
		} else if (canSupportAssistedDialing()) {
		primaryActionButtonView.setTag(
		IntentProvider.getAssistedDialIntentProvider(

java/com/android/dialer/app/calllog/IntentProvider.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -154,14 +154,13 @@ public abstract class IntentProvider {
		};
		}

		public static IntentProvider getReturnVoicemailCallIntentProvider(
		@Nullable PhoneAccountHandle phoneAccountHandle) {
		public static IntentProvider getReturnVoicemailCallIntentProvider() {
		return new IntentProvider() {
		@Override
		public Intent getClickIntent(Context context) {
		return PreCall.getIntent(
		context,
		CallIntentBuilder.forVoicemail(phoneAccountHandle, CallInitiationType.Type.CALL_LOG));
		CallIntentBuilder.forVoicemail(CallInitiationType.Type.CALL_LOG));
		}
		};
		}

java/com/android/dialer/app/calllog/LegacyVoicemailNotifier.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import com.android.dialer.common.LogUtil;
		import com.android.dialer.location.GeoUtil;
		import com.android.dialer.notification.DialerNotificationManager;
		import com.android.dialer.notification.NotificationChannelManager;
		import com.android.dialer.notification.VoicemailChannelUtils;
		import com.android.dialer.phonenumberutil.PhoneNumberHelper;
		import com.android.dialer.telecom.TelecomUtil;

		@@ -165,7 +166,8 @@ public final class LegacyVoicemailNotifier {
		if (context.getSystemService(TelephonyManager.class).getPhoneCount() <= 1) {
		return NOTIFICATION_TAG;
		}
		return NOTIFICATION_TAG_PREFIX + phoneAccountHandle.getId();
		return NOTIFICATION_TAG_PREFIX
		+ VoicemailChannelUtils.getHashedPhoneAccountId(phoneAccountHandle);
		}

		private LegacyVoicemailNotifier() {}

java/com/android/dialer/callintent/CallIntentBuilder.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -113,10 +113,10 @@ public class CallIntentBuilder implements Parcelable {
		}

		public static CallIntentBuilder forVoicemail(
		@Nullable PhoneAccountHandle phoneAccountHandle, CallInitiationType.Type callInitiationType) {
		CallInitiationType.Type callInitiationType) {
		return new CallIntentBuilder(
		Uri.fromParts(PhoneAccount.SCHEME_VOICEMAIL, "", null), callInitiationType)
		.setPhoneAccountHandle(phoneAccountHandle);
		.setPhoneAccountHandle(null);
		}

		public void setUri(@NonNull Uri uri) {