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

Merge "Throw exception on rule creation failure." into nyc-dev

Browse Source 
am: 252a6b125b

* commit '252a6b125bdaced7d928167e0fbc4dd2ba95e8a1':
  Throw exception on rule creation failure.

Change-Id: I105b73c9888b6c871a1ab7863a79ca79f4d1d8a7
This commit is contained in:
Julia Reynolds
2016-05-16 18:29:16 +00:00
committed by android-build-merger
parent 03905d07ac 252a6b125b
commit 2e1c9f1539
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/notification/ZenModeHelper.java
View File

@@ -55,6 +55,7 @@ import android.service.notification.ZenModeConfig.EventInfo;
import android.service.notification.ZenModeConfig.ScheduleInfo;
import android.service.notification.ZenModeConfig.ZenRule;
import android.text.TextUtils;
import android.util.AndroidRuntimeException;
import android.util.Log;
import android.util.SparseArray;
@@ -293,7 +294,9 @@ public class ZenModeHelper {
ZenModeConfig newConfig;
synchronized (mConfig) {
if (mConfig == null) return null;
if (mConfig == null) {
throw new AndroidRuntimeException("Could not create rule");
}
if (DEBUG) {
Log.d(TAG, "addAutomaticZenRule rule= " + automaticZenRule + " reason=" + reason);
}
@@ -304,7 +307,7 @@ public class ZenModeHelper {
if (setConfigLocked(newConfig, reason, true)) {
return rule.id;
} else {
return null;
throw new AndroidRuntimeException("Could not create rule");
}
}
}