Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Skip unnecessary IPC when getting VibrationEffect." into rvc-dev am: 60e19c7656 am: 7a210aae64" into rvc-d1-dev-plus-aosp

Browse Source
This commit is contained in:
Automerger Merge Worker
2020-03-20 18:15:40 +00:00
committed by Android (Google) Code Review
parent ef2adec7ed 6bc51cc22e
commit d69c6d3d8b
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/os/VibrationEffect.java
View File

@@ -343,6 +343,14 @@ public abstract class VibrationEffect implements Parcelable {
@TestApi @TestApi
@Nullable @Nullable
public static VibrationEffect get(Uri uri, Context context) { public static VibrationEffect get(Uri uri, Context context) {
String[] uris = context.getResources().getStringArray(
com.android.internal.R.array.config_ringtoneEffectUris);
// Skip doing any IPC if we don't have any effects configured.
if (uris.length == 0) {
return null;
}
final ContentResolver cr = context.getContentResolver(); final ContentResolver cr = context.getContentResolver();
Uri uncanonicalUri = cr.uncanonicalize(uri); Uri uncanonicalUri = cr.uncanonicalize(uri);
if (uncanonicalUri == null) { if (uncanonicalUri == null) {
@@ -351,8 +359,7 @@ public abstract class VibrationEffect implements Parcelable {
// place. // place.
uncanonicalUri = uri; uncanonicalUri = uri;
} }
String[] uris = context.getResources().getStringArray(
com.android.internal.R.array.config_ringtoneEffectUris);
for (int i = 0; i < uris.length && i < RINGTONES.length; i++) { for (int i = 0; i < uris.length && i < RINGTONES.length; i++) {
if (uris[i] == null) { if (uris[i] == null) {
continue; continue;