diff options
| author | Anthony <Helios747@users.noreply.github.com> | 2019-02-03 12:45:02 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-03 12:45:02 -0800 |
| commit | dc15c969edb02e61d5e7ef0ac57825f5936db42b (patch) | |
| tree | 17f207a352af6b7bb8ebbbb9adf7446299df4d94 /Source/Android/app/src/main/java | |
| parent | f65b3a998c457add6dc25e03bc49f6069b285684 (diff) | |
| parent | b9e402e8b0030a1b221188b70f2a995097e03470 (diff) | |
Merge pull request #7724 from zackhow/rum
Android: Don't clear vibrators in onStop
Diffstat (limited to 'Source/Android/app/src/main/java')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java | 1 | ||||
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Rumble.java | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java index cf75b127e0..880487c00e 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java @@ -324,7 +324,6 @@ public final class EmulationActivity extends AppCompatActivity protected void onStop() { super.onStop(); - Rumble.clear(); } @Override diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Rumble.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Rumble.java index 7acc7c4a94..c2f7ac4d59 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Rumble.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Rumble.java @@ -18,10 +18,12 @@ import java.util.HashMap; public class Rumble { private static Vibrator phoneVibrator; - private static SparseArray<Vibrator> emuVibrators; + private static final SparseArray<Vibrator> emuVibrators = new SparseArray<>(); public static void initRumble(EmulationActivity activity) { + clear(); + if (activity.deviceHasTouchScreen() && PreferenceManager.getDefaultSharedPreferences(activity) .getBoolean("phoneRumble", true)) @@ -29,7 +31,6 @@ public class Rumble setPhoneVibrator(true, activity); } - emuVibrators = new SparseArray<>(); for (int i = 0; i < 8; i++) { StringSetting deviceName = @@ -65,7 +66,7 @@ public class Rumble } } - public static void clear() + private static void clear() { phoneVibrator = null; emuVibrators.clear(); |