diff options
| author | Rubin Xu <rubinxu@google.com> | 2017-02-10 12:32:57 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-02-10 12:32:57 +0000 |
| commit | 5d1aa364753a2aedab14031ec22015597c122d04 (patch) | |
| tree | c898a439a97c2c302a8a68557b484d870095fdf3 /core/java/android | |
| parent | 186c0839d826e47167b12b3df9b35665fa15c836 (diff) | |
| parent | 0f2c853889f382d5ea321028b5bd40dd74db25a3 (diff) | |
Merge "Fix uri permission grant on remote bug report uri" into nyc-dev am: 42f2e80293 am: 824c8284ce am: 72074e3ab9 am: f85a20702a
am: 0f2c853889
Change-Id: Icfdd2a6027c75e43c78f85109341ae088102548b
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 0861b0fa9cff..2fd7d3c51c43 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -361,7 +361,7 @@ public class DevicePolicyManager { * @hide */ public static final String ACTION_BUGREPORT_SHARING_ACCEPTED = - "com.android.server.action.BUGREPORT_SHARING_ACCEPTED"; + "com.android.server.action.REMOTE_BUGREPORT_SHARING_ACCEPTED"; /** * Action: Bugreport sharing with device owner has been declined by the user. @@ -369,7 +369,7 @@ public class DevicePolicyManager { * @hide */ public static final String ACTION_BUGREPORT_SHARING_DECLINED = - "com.android.server.action.BUGREPORT_SHARING_DECLINED"; + "com.android.server.action.REMOTE_BUGREPORT_SHARING_DECLINED"; /** * Action: Bugreport has been collected and is dispatched to {@link DevicePolicyManagerService}. |