mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-31 13:18:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7724 from zackhow/rum

Browse source 
Android: Don't clear vibrators in onStop
This commit is contained in:
Anthony 2019-02-03 12:45:02 -08:00 • committed by GitHub
commit dc15c969ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
View file

@ -324,7 +324,6 @@ public final class EmulationActivity extends AppCompatActivity
protected void onStop() protected void onStop()
{ {
super.onStop(); super.onStop();
Rumble.clear();
} }
@Override @Override

7
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Rumble.java
View file

@ -18,10 +18,12 @@ import java.util.HashMap;
public class Rumble public class Rumble
{ {
private static Vibrator phoneVibrator; private static Vibrator phoneVibrator;
private static SparseArray<Vibrator> emuVibrators; private static final SparseArray<Vibrator> emuVibrators = new SparseArray<>();
public static void initRumble(EmulationActivity activity) public static void initRumble(EmulationActivity activity)
{ {
clear();
if (activity.deviceHasTouchScreen() && if (activity.deviceHasTouchScreen() &&
PreferenceManager.getDefaultSharedPreferences(activity) PreferenceManager.getDefaultSharedPreferences(activity)
.getBoolean("phoneRumble", true)) .getBoolean("phoneRumble", true))
@ -29,7 +31,6 @@ public class Rumble
setPhoneVibrator(true, activity); setPhoneVibrator(true, activity);
} }
emuVibrators = new SparseArray<>();
for (int i = 0; i < 8; i++) for (int i = 0; i < 8; i++)
{ {
StringSetting deviceName = StringSetting deviceName =
@ -65,7 +66,7 @@ public class Rumble
} }
} }
public static void clear() private static void clear()
{ {
phoneVibrator = null; phoneVibrator = null;
emuVibrators.clear(); emuVibrators.clear();