summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chad Brubaker <cbrubaker@google.com> 2017-09-06 18:30:18 +0000
committer android-build-merger <android-build-merger@google.com> 2017-09-06 18:30:18 +0000
commit47be923fd5c020090abee33d7da8bffeee1ea87c (patch)
treec34730d2f49c5c98cb0cf8c95a143967f11ef251
parent8ca3a3661bbf3f7253933699fd1016c89e21f057 (diff)
parent102f564165c93ef91f61c6c56cad7b2713f4e15a (diff)
Merge "Allow Instant Apps to access send_action_app_error" into oc-mr1-dev
am: 102f564165 Change-Id: Iaec41b49ab0fd6d312efc08b05b3cff0b12c4401
-rwxr-xr-xcore/java/android/provider/Settings.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 33eb8c2b73db..5b9e399e5c38 100755
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -10777,6 +10777,7 @@ public final class Settings {
INSTANT_APP_SETTINGS.add(ANIMATOR_DURATION_SCALE);
INSTANT_APP_SETTINGS.add(DEBUG_VIEW_ATTRIBUTES);
INSTANT_APP_SETTINGS.add(WTF_IS_FATAL);
+ INSTANT_APP_SETTINGS.add(SEND_ACTION_APP_ERROR);
}
/**