diff options
| author | Yoshiaki Naka <yoshiaki.naka@sony.com> | 2019-11-05 23:03:09 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-05 23:03:09 -0800 |
| commit | 08d27eea63c45936ede1e9e67c4084fd952cd9e1 (patch) | |
| tree | b493e3d33da1846bad7f806c092024b18c178d19 /src | |
| parent | e3ed5f80a5ee42e017504a9519d407a6411fb9c9 (diff) | |
| parent | 7833dc5de2217e6d9331a947d4a841da58312dfe (diff) | |
| download | Stk-08d27eea63c45936ede1e9e67c4084fd952cd9e1.tar.gz | |
Merge "Consider long system notification sound set by user" am: 858b4d7278 am: 34f01b4d91
am: 7833dc5de2
Change-Id: Ia9bd46fd0addc6e7f9f37ff26f95c032a98788ac
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/stk/StkAppService.java | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/com/android/stk/StkAppService.java b/src/com/android/stk/StkAppService.java index c68dd83..43035f0 100644 --- a/src/com/android/stk/StkAppService.java +++ b/src/com/android/stk/StkAppService.java @@ -40,7 +40,6 @@ import android.content.res.Resources; import android.content.res.Resources.NotFoundException; import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import android.media.RingtoneManager; import android.net.Uri; import android.os.Bundle; import android.os.Handler; @@ -1663,22 +1662,6 @@ public class StkAppService extends Service implements Runnable { // if user cannot see the message from the card right now because of it. // The notification can be dismissed if user removed the keyguard screen. launchNotificationOnKeyguard(slotId, message); - } else if (!(pm.isInteractive() && isTopOfStack())) { - // User might be doing something but it is not related to the SIM Toolkit. - // Play the tone and do vibration in order to attract user's attention. - // User will see the input screen or the dialog soon in this case. - NotificationChannel channel = mNotificationManager - .getNotificationChannel(STK_NOTIFICATION_CHANNEL_ID); - Uri uri = channel.getSound(); - if (uri != null && !Uri.EMPTY.equals(uri) - && (NotificationManager.IMPORTANCE_LOW) < channel.getImportance()) { - RingtoneManager.getRingtone(getApplicationContext(), uri).play(); - } - long[] pattern = channel.getVibrationPattern(); - if (pattern != null && channel.shouldVibrate()) { - ((Vibrator) this.getSystemService(Context.VIBRATOR_SERVICE)) - .vibrate(pattern, -1); - } } // Turn on the screen. |