Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Google Security patch Integration specific to auto. #2676

Open
wants to merge 1 commit into
base: celadon/t/mr0/master
Choose a base branch
from
Open

Google Security patch Integration specific to auto. #2676

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions ...es/apps/Car/Launcher/0001-DO-NOT-MERGE-Stop-reading-component-name-from-call-extras.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
From a5bf40b3d410849ceabfaf3f462f714233961771 Mon Sep 17 00:00:00 2001
From: Yiqun Wu <[email protected]>
Date: Mon, 24 Jun 2024 19:50:11 +0000
Subject: [PATCH] DO NOT MERGE: Stop reading component name from call extras

Bug: 335585728
Test: mma
Change-Id: I3f500a35a4615843601a1d6284d5de6d32b3d300
Merged-In: I3f500a35a4615843601a1d6284d5de6d32b3d300
---
.../carlauncher/homescreen/audio/InCallModel.java | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/com/android/car/carlauncher/homescreen/audio/InCallModel.java b/src/com/android/car/carlauncher/homescreen/audio/InCallModel.java
index a58632f..21cc3dc 100644
--- a/src/com/android/car/carlauncher/homescreen/audio/InCallModel.java
+++ b/src/com/android/car/carlauncher/homescreen/audio/InCallModel.java
@@ -25,7 +25,6 @@ import android.content.ServiceConnection;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
-import android.os.Bundle;
import android.os.IBinder;
import android.telecom.Call;
import android.telecom.CallAudioState;
@@ -178,17 +177,9 @@ public class InCallModel implements HomeCardInterface.Model, InCallServiceImpl.I
public void onClick(View view) {
Intent intent = null;
if (isSelfManagedCall() && mSelfManagedCallUtil.canShowCalInCallView()) {
- Bundle extras = mCurrentCall.getDetails().getExtras();
- ComponentName componentName = extras == null ? null : extras.getParcelable(
- Intent.EXTRA_COMPONENT_NAME, ComponentName.class);
- if (componentName != null) {
- intent = new Intent();
- intent.setComponent(componentName);
- } else {
- String callingAppPackageName = getCallingAppPackageName();
- if (!TextUtils.isEmpty(callingAppPackageName)) {
- intent = mPackageManager.getLaunchIntentForPackage(callingAppPackageName);
- }
+ String callingAppPackageName = getCallingAppPackageName();
+ if (!TextUtils.isEmpty(callingAppPackageName)) {
+ intent = mPackageManager.getLaunchIntentForPackage(callingAppPackageName);
}
} else {
intent = mPackageManager.getLaunchIntentForPackage(
--
2.46.0.rc1.232.g9752f9e123-goog