diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index e7465c0..d5ed04a 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -41,6 +41,7 @@
 import android.os.Environment;
 import android.os.FileUtils;
 import android.os.Handler;
+import android.os.IBinder;
 import android.os.IUserManager;
 import android.os.Message;
 import android.os.ParcelFileDescriptor;
@@ -188,6 +189,8 @@
     private final File mUsersDir;
     private final File mUserListFile;
 
+    private static final IBinder mUserRestriconToken = new Binder();
+
     /**
      * User-related information that is used for persisting to flash. Only UserInfo is
      * directly exposed to other system apps.
@@ -1016,7 +1019,7 @@
         if (mAppOpsService != null) { // We skip it until system-ready.
             final long token = Binder.clearCallingIdentity();
             try {
-                mAppOpsService.setUserRestrictions(effective, userId);
+                mAppOpsService.setUserRestrictions(effective, mUserRestriconToken, userId);
             } catch (RemoteException e) {
                 Log.w(LOG_TAG, "Unable to notify AppOpsService of UserRestrictions");
             } finally {
