commit a078b4ba6a30532585e93b7d99f81fd0184aeb56
author Nicolas Prévot <nprevot@google.com> Fri Apr 08 12:41:49 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 08 12:41:50 2016 +0000
tree f2f4632da4e7153289bdfac3deb9f5838c0b4dab
parent 5c1fbadb1a1169186b7a0a357ae9c35183258c6c
parent 8aa48028f36a411192623881191c2591a009a997

Merge "Still return a package suspsended dialog if there is no owner." into nyc-dev

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index fdea84b..72eebb5 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -8078,7 +8078,8 @@
                     }
                 }
             }
-            return null;
+            // We're not specifying the device admin because there isn't one.
+            return intent;
         }
     }