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

Merge "Only call finish on operations that have started." into nyc-dev

Browse Source 
am: 6df8a9a89f

* commit '6df8a9a89fc87649595926592bf895768c861b68':
  Only call finish on operations that have started.

Change-Id: I59f9c9a74cf2beba8f14906820b65ae8d22ed8ce
This commit is contained in:
Julia Reynolds
2016-06-01 20:46:09 +00:00
committed by android-build-merger
parent d7b9669b54 6df8a9a89f
commit f2f7bc0454
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/VibratorService.java
View File

@@ -306,7 +306,6 @@ public class VibratorService extends IVibratorService.Stub
synchronized (mVibrations) { synchronized (mVibrations) {
removeVibrationLocked(token); removeVibrationLocked(token);
doCancelVibrateLocked(); doCancelVibrateLocked();
mCurrentVibration = vib;
addToPreviousVibrationsLocked(vib); addToPreviousVibrationsLocked(vib);
startVibrationLocked(vib); startVibrationLocked(vib);
} }
@@ -368,7 +367,6 @@ public class VibratorService extends IVibratorService.Stub
} else { } else {
// A negative repeat means that this pattern is not meant // A negative repeat means that this pattern is not meant
// to repeat. Treat it like a simple vibration. // to repeat. Treat it like a simple vibration.
mCurrentVibration = vib;
startVibrationLocked(vib); startVibrationLocked(vib);
} }
addToPreviousVibrationsLocked(vib); addToPreviousVibrationsLocked(vib);
@@ -443,8 +441,7 @@ public class VibratorService extends IVibratorService.Stub
mCurrentVibration = null; mCurrentVibration = null;
return; return;
} }
mCurrentVibration = mVibrations.getFirst(); startVibrationLocked(mVibrations.getFirst());
startVibrationLocked(mCurrentVibration);
} }
// Lock held on mVibrations // Lock held on mVibrations
@@ -466,7 +463,9 @@ public class VibratorService extends IVibratorService.Stub
mode = mAppOpsService.startOperation(AppOpsManager.getToken(mAppOpsService), mode = mAppOpsService.startOperation(AppOpsManager.getToken(mAppOpsService),
AppOpsManager.OP_VIBRATE, vib.mUid, vib.mOpPkg); AppOpsManager.OP_VIBRATE, vib.mUid, vib.mOpPkg);
} }
if (mode != AppOpsManager.MODE_ALLOWED) { if (mode == AppOpsManager.MODE_ALLOWED) {
mCurrentVibration = vib;
} else {
if (mode == AppOpsManager.MODE_ERRORED) { if (mode == AppOpsManager.MODE_ERRORED) {
Slog.w(TAG, "Would be an error: vibrate from uid " + vib.mUid); Slog.w(TAG, "Would be an error: vibrate from uid " + vib.mUid);
} }