Merge tag 'android-15.0.0_r6' of https://android.googlesource.com/platform/packages/services/Telecomm into HEAD
Android 15.0.0 Release 6 (AP4A.241205.013)
Change-Id: I37f25877230a9d09a74d37797cc7fe5b590d78bf
Signed-off-by: micky387 <mickaelsaibi@free.fr>
diff --git a/src/com/android/server/telecom/InCallController.java b/src/com/android/server/telecom/InCallController.java
index 529bc79..7d2bd0b 100644
--- a/src/com/android/server/telecom/InCallController.java
+++ b/src/com/android/server/telecom/InCallController.java
@@ -47,9 +47,12 @@
import android.os.RemoteException;
import android.os.UserHandle;
import android.os.UserManager;
+import android.os.Vibrator;
+import android.provider.Settings;
import android.telecom.CallAudioState;
import android.telecom.CallEndpoint;
import android.telecom.ConnectionService;
+import android.telecom.DisconnectCause;
import android.telecom.InCallService;
import android.telecom.Log;
import android.telecom.Logging.Runnable;
@@ -69,6 +72,8 @@
import com.android.server.telecom.flags.FeatureFlags;
import com.android.server.telecom.ui.NotificationChannelManager;
+import org.omnirom.omnilib.utils.OmniSettings;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -1689,9 +1694,27 @@
Log.i(this, "onCallStateChanged: Call state changed for TC@%s: %s -> %s", call.getId(),
CallState.toString(oldState), CallState.toString(newState));
maybeTrackMicrophoneUse(isMuted());
+ boolean vibrateOnConnect = Settings.System.getIntForUser(mContext.getContentResolver(),
+ OmniSettings.OMNI_VIBRATE_ON_CONNECT, 0, UserHandle.USER_CURRENT) == 1;
+ boolean vibrateOnDisconnect = Settings.System.getIntForUser(mContext.getContentResolver(),
+ OmniSettings.OMNI_VIBRATE_ON_DISCONNECT, 0, UserHandle.USER_CURRENT) == 1;
+
+ if (oldState == CallState.DIALING && newState == CallState.ACTIVE && vibrateOnConnect) {
+ vibrate(100, 200, 0);
+ } else if (oldState == CallState.ACTIVE && newState == CallState.DISCONNECTED
+ && vibrateOnDisconnect) {
+ vibrate(100, 200, 0);
+ }
updateCall(call);
}
+ public void vibrate(int v1, int p1, int v2) {
+ long[] pattern = new long[] {
+ 0, v1, p1, v2
+ };
+ ((Vibrator) mContext.getSystemService(Context.VIBRATOR_SERVICE)).vibrate(pattern, -1);
+ }
+
@Override
public void onConnectionServiceChanged(
Call call,
diff --git a/src/com/android/server/telecom/Ringer.java b/src/com/android/server/telecom/Ringer.java
index c309dd5..37ff768 100644
--- a/src/com/android/server/telecom/Ringer.java
+++ b/src/com/android/server/telecom/Ringer.java
@@ -45,6 +45,7 @@
import android.os.Vibrator;
import android.os.vibrator.persistence.ParsedVibration;
import android.os.vibrator.persistence.VibrationXmlParser;
+import android.provider.Settings;
import android.telecom.Log;
import android.telecom.TelecomManager;
import android.util.Pair;
@@ -54,6 +55,8 @@
import com.android.server.telecom.LogUtils.EventTimer;
import com.android.server.telecom.flags.FeatureFlags;
+import org.omnirom.omnilib.utils.OmniSettings;
+
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -602,6 +605,11 @@
stopRinging();
+ if (Settings.System.getIntForUser(mContext.getContentResolver(),
+ OmniSettings.OMNI_VIBRATE_ON_CALLWAITING, 0, UserHandle.USER_CURRENT) == 1) {
+ vibrate(200, 300, 500);
+ }
+
if (mCallWaitingPlayer == null) {
Log.addEvent(call, LogUtils.Events.START_CALL_WAITING_TONE, reason);
mCallWaitingCall = call;
@@ -817,6 +825,13 @@
}
}
+ public void vibrate(int v1, int p1, int v2) {
+ long[] pattern = new long[] {
+ 0, v1, p1, v2
+ };
+ ((Vibrator) mContext.getSystemService(Context.VIBRATOR_SERVICE)).vibrate(pattern, -1);
+ }
+
@Nullable
private static VibrationEffect loadSerializedDefaultRingVibration(
Resources resources, Vibrator vibrator) {
diff --git a/src/com/android/server/telecom/RingtoneFactory.java b/src/com/android/server/telecom/RingtoneFactory.java
index c740c24..5298069 100644
--- a/src/com/android/server/telecom/RingtoneFactory.java
+++ b/src/com/android/server/telecom/RingtoneFactory.java
@@ -30,6 +30,7 @@
import android.provider.Settings;
import android.telecom.Log;
+import android.telephony.SubscriptionManager;
import android.text.TextUtils;
import com.android.internal.annotations.VisibleForTesting;
@@ -85,20 +86,25 @@
if (ringtone == null) {
// Contact didn't specify ringtone or custom Ringtone creation failed. Get default
// ringtone for user or profile.
- Context contextToUse = hasDefaultRingtoneForUser(userContext) ? userContext : mContext;
+ int subId = mCallsManager.getPhoneAccountRegistrar()
+ .getSubscriptionIdForPhoneAccount(incomingCall.getTargetPhoneAccount());
+ int phoneId = SubscriptionManager.getPhoneId(subId);
+ Context contextToUse = hasDefaultRingtoneForUserBySlot(userContext, phoneId)
+ ? userContext : mContext;
UserManager um = contextToUse.getSystemService(UserManager.class);
boolean isUserUnlocked = mFeatureFlags.telecomResolveHiddenDependencies()
? um.isUserUnlocked(contextToUse.getUser())
: um.isUserUnlocked(contextToUse.getUserId());
Uri defaultRingtoneUri;
if (isUserUnlocked) {
- defaultRingtoneUri = RingtoneManager.getActualDefaultRingtoneUri(contextToUse,
- RingtoneManager.TYPE_RINGTONE);
+ defaultRingtoneUri = RingtoneManager.getActualDefaultRingtoneUriBySlot(
+ contextToUse, RingtoneManager.TYPE_RINGTONE, phoneId);
if (defaultRingtoneUri == null) {
Log.i(this, "getRingtone: defaultRingtoneUri for user is null.");
}
} else {
- defaultRingtoneUri = Settings.System.DEFAULT_RINGTONE_URI;
+ defaultRingtoneUri = phoneId == 1 ? Settings.System.DEFAULT_RINGTONE2_URI
+ : Settings.System.DEFAULT_RINGTONE_URI;
if (defaultRingtoneUri == null) {
Log.i(this, "getRingtone: Settings.System.DEFAULT_RINGTONE_URI is null.");
}
@@ -178,12 +184,14 @@
return null;
}
- private boolean hasDefaultRingtoneForUser(Context userContext) {
+ private boolean hasDefaultRingtoneForUserBySlot(Context userContext, int phoneId) {
if(userContext == null) {
return false;
}
+ String ringtoneSetting = phoneId == 1 ? Settings.System.RINGTONE2
+ : Settings.System.RINGTONE;
return !TextUtils.isEmpty(Settings.System.getStringForUser(userContext.getContentResolver(),
- Settings.System.RINGTONE, userContext.getUserId()));
+ ringtoneSetting, userContext.getUserId()));
}
private boolean isWorkContact(Call incomingCall) {