diff --git a/TMessagesProj/build.gradle b/TMessagesProj/build.gradle
index 61a65305789..0490123390d 100644
--- a/TMessagesProj/build.gradle
+++ b/TMessagesProj/build.gradle
@@ -27,9 +27,10 @@ dependencies {
implementation 'com.google.android.gms:play-services-cast-framework:21.4.0'
implementation "androidx.mediarouter:mediarouter:1.7.0"
+ implementation "androidx.media:media:1.7.0"
+ implementation "androidx.lifecycle:lifecycle-runtime:2.7.0"
- implementation 'androidx.car.app:app:1.4.0'
- implementation 'androidx.car.app:app-projected:1.4.0'
+ implementation 'androidx.car.app:app:1.7.0'
implementation 'org.nanohttpd:nanohttpd:2.3.1'
compileOnly 'org.checkerframework:checker-qual:2.5.2'
diff --git a/TMessagesProj/src/main/AndroidManifest.xml b/TMessagesProj/src/main/AndroidManifest.xml
index 6f6d377d029..bc19a5d780e 100644
--- a/TMessagesProj/src/main/AndroidManifest.xml
+++ b/TMessagesProj/src/main/AndroidManifest.xml
@@ -672,7 +672,6 @@
-
+ android:value="7" />
diff --git a/TMessagesProj/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java b/TMessagesProj/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
index e15fa6b5a6d..a30f4b91c8e 100644
--- a/TMessagesProj/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
+++ b/TMessagesProj/src/main/java/com/google/android/exoplayer2/ext/mediasession/MediaSessionConnector.java
@@ -34,12 +34,12 @@
import android.os.Looper;
import android.os.ResultReceiver;
import android.os.SystemClock;
-import android.support.v4.media.MediaDescriptionCompat;
-import android.support.v4.media.MediaMetadataCompat;
-import android.support.v4.media.RatingCompat;
-import android.support.v4.media.session.MediaControllerCompat;
-import android.support.v4.media.session.MediaSessionCompat;
-import android.support.v4.media.session.PlaybackStateCompat;
+import androidx.media.MediaDescriptionCompat;
+import androidx.media.MediaMetadataCompat;
+import androidx.media.RatingCompat;
+import androidx.media.session.MediaControllerCompat;
+import androidx.media.session.MediaSessionCompat;
+import androidx.media.session.PlaybackStateCompat;
import android.util.Pair;
import android.view.KeyEvent;
import androidx.annotation.LongDef;
diff --git a/TMessagesProj/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java b/TMessagesProj/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java
index 887acea7985..e674933a696 100644
--- a/TMessagesProj/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java
+++ b/TMessagesProj/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java
@@ -17,9 +17,9 @@
import android.os.Bundle;
import android.os.ResultReceiver;
-import android.support.v4.media.MediaDescriptionCompat;
-import android.support.v4.media.session.MediaControllerCompat;
-import android.support.v4.media.session.MediaSessionCompat;
+import androidx.media.MediaDescriptionCompat;
+import androidx.media.session.MediaControllerCompat;
+import androidx.media.session.MediaSessionCompat;
import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.MediaItem;
diff --git a/TMessagesProj/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java b/TMessagesProj/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
index 4277de3c326..8acd1be59e2 100644
--- a/TMessagesProj/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
+++ b/TMessagesProj/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueNavigator.java
@@ -22,9 +22,9 @@
import android.os.Bundle;
import android.os.ResultReceiver;
-import android.support.v4.media.MediaDescriptionCompat;
-import android.support.v4.media.session.MediaSessionCompat;
-import android.support.v4.media.session.PlaybackStateCompat;
+import androidx.media.MediaDescriptionCompat;
+import androidx.media.session.MediaSessionCompat;
+import androidx.media.session.PlaybackStateCompat;
import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Player;
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MusicPlayerService.java b/TMessagesProj/src/main/java/org/telegram/messenger/MusicPlayerService.java
index 989fda4aab7..4dd2039ce7b 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/MusicPlayerService.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/MusicPlayerService.java
@@ -25,9 +25,9 @@
import android.media.AudioManager;
import android.media.MediaMetadataRetriever;
import android.media.RemoteControlClient;
-import android.support.v4.media.MediaMetadataCompat;
-import android.support.v4.media.session.MediaSessionCompat;
-import android.support.v4.media.session.PlaybackStateCompat;
+import androidx.media.MediaMetadataCompat;
+import androidx.media.session.MediaSessionCompat;
+import androidx.media.session.PlaybackStateCompat;
import android.net.Uri;
import android.os.Build;
import android.os.IBinder;
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/TelegramMediaSession.java b/TMessagesProj/src/main/java/org/telegram/messenger/TelegramMediaSession.java
index ae3a5f93738..5dd60fb2bee 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/TelegramMediaSession.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/TelegramMediaSession.java
@@ -17,10 +17,10 @@
import android.os.Build;
import android.os.Bundle;
import android.os.SystemClock;
-import android.support.v4.media.MediaDescriptionCompat;
-import android.support.v4.media.MediaMetadataCompat;
-import android.support.v4.media.session.MediaSessionCompat;
-import android.support.v4.media.session.PlaybackStateCompat;
+import androidx.media.MediaDescriptionCompat;
+import androidx.media.MediaMetadataCompat;
+import androidx.media.session.MediaSessionCompat;
+import androidx.media.session.PlaybackStateCompat;
import android.text.TextUtils;
import androidx.annotation.Nullable;
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/car/HomeScreen.java b/TMessagesProj/src/main/java/org/telegram/messenger/car/HomeScreen.java
index bcbff8da5ae..aef4fa41caa 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/car/HomeScreen.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/car/HomeScreen.java
@@ -268,7 +268,7 @@ private CarMessage buildCarMessage(MessageObject mo, long dialogId, boolean isGr
} else if (chat != null) {
senderBuilder.setName(chat.title != null ? chat.title : "").setKey("c" + chat.id);
} else {
- senderBuilder.setName("");
+ senderBuilder.setName("").setKey("d" + dialogId);
}
return new CarMessage.Builder()
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/car/MusicSongsScreen.java b/TMessagesProj/src/main/java/org/telegram/messenger/car/MusicSongsScreen.java
index 767a447982c..f4dd94e2500 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/car/MusicSongsScreen.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/car/MusicSongsScreen.java
@@ -1,6 +1,6 @@
package org.telegram.messenger.car;
-import android.support.v4.media.session.MediaControllerCompat;
+import androidx.media.session.MediaControllerCompat;
import androidx.annotation.NonNull;
import androidx.car.app.CarContext;
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/pip/PipActivityController.java b/TMessagesProj/src/main/java/org/telegram/messenger/pip/PipActivityController.java
index dccd5fff146..3edec8b3228 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/pip/PipActivityController.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/pip/PipActivityController.java
@@ -1,7 +1,7 @@
package org.telegram.messenger.pip;
import android.app.Activity;
-import android.support.v4.media.session.MediaSessionCompat;
+import androidx.media.session.MediaSessionCompat;
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
diff --git a/TMessagesProj/src/main/res/xml/automotive_app_desc.xml b/TMessagesProj/src/main/res/xml/automotive_app_desc.xml
index f7100d2c796..d266fac0398 100644
--- a/TMessagesProj/src/main/res/xml/automotive_app_desc.xml
+++ b/TMessagesProj/src/main/res/xml/automotive_app_desc.xml
@@ -2,4 +2,5 @@
-
\ No newline at end of file
+
+