commit 88059d23ed79e25fd54cb00e7c463dcb9bf79939
author Xiaohui Chen <xiaohuic@google.com> Wed Oct 21 13:19:21 2015 -0700
committer Xiaohui Chen <xiaohuic@google.com> Wed Oct 21 13:19:21 2015 -0700
tree 5a1064ba4c6c12eacd413ba913d759af5b60d6b5
parent a43ddf1af72fb967627bab0fd9538f0ec28b661d

Clean up UserHandle.isOwner() in stk

Bug: 24869636
Change-Id: Iad13a37bf3ea9351719981beb296b0d2c0d88b2a

src/com/android/stk/BootCompletedReceiver.java

diff --git a/src/com/android/stk/BootCompletedReceiver.java b/src/com/android/stk/BootCompletedReceiver.java
index ff46a50..3f06f25 100644
--- a/src/com/android/stk/BootCompletedReceiver.java
+++ b/src/com/android/stk/BootCompletedReceiver.java
@@ -44,7 +44,8 @@
                     .putExtras(args));
             CatLog.d(LOG_TAG, "[ACTION_BOOT_COMPLETED]");
         } else if(action.equals(Intent.ACTION_USER_INITIALIZE)) {
-            if (!android.os.Process.myUserHandle().isOwner()) {
+            // TODO: http://b/25155491
+            if (!android.os.Process.myUserHandle().isSystem()) {
                 //Disable package for all secondary users. Package is only required for device
                 //owner.
                 context.getPackageManager().setApplicationEnabledSetting(context.getPackageName(),