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

Merge "Merge "Only call finish on operations that have started." into nyc-dev am: 6df8a9a89f am: e24e9a0333" into nyc-mr1-dev-plus-aosp

Browse Source 
am: 2ec07c96ef

* commit '2ec07c96ef75fdd84b194689de300ffc21ee1f2f':
  Only call finish on operations that have started.

Change-Id: I0c7f6965b8264e9928120dffd370f1df0c9ea646
This commit is contained in:
Julia Reynolds
2016-06-02 00:23:32 +00:00
committed by android-build-merger
parent 6f83f46aaa 2ec07c96ef
commit 9cec41f03a
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) {
removeVibrationLocked(token);
doCancelVibrateLocked();
mCurrentVibration = vib;
addToPreviousVibrationsLocked(vib);
startVibrationLocked(vib);
}
@@ -368,7 +367,6 @@ public class VibratorService extends IVibratorService.Stub
} else {
// A negative repeat means that this pattern is not meant
// to repeat. Treat it like a simple vibration.
mCurrentVibration = vib;
startVibrationLocked(vib);
}
addToPreviousVibrationsLocked(vib);
@@ -443,8 +441,7 @@ public class VibratorService extends IVibratorService.Stub
mCurrentVibration = null;
return;
}
mCurrentVibration = mVibrations.getFirst();
startVibrationLocked(mCurrentVibration);
startVibrationLocked(mVibrations.getFirst());
}
// Lock held on mVibrations
@@ -466,7 +463,9 @@ public class VibratorService extends IVibratorService.Stub
mode = mAppOpsService.startOperation(AppOpsManager.getToken(mAppOpsService),
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) {
Slog.w(TAG, "Would be an error: vibrate from uid " + vib.mUid);
}