commit ff7c67f224a7d49e549551f609cc70cab2e9677e
author Matthew Williams <mjwilliams@google.com> Thu Oct 02 20:53:29 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 02 20:53:29 2014 +0000
tree fa26dea6bb4d61b3d6385d2ccae6b4b1ac03a7a7
parent 5468f545ff66e8fe8db4fdb90dc387ace9756257
parent 5c6756fefb6db0fe468b9d747960a6da344880ad

am 5c6756fe: Revert "Protect LOGIN_ACCOUNTS_CHANGED receiver in SyncManager"

* commit '5c6756fefb6db0fe468b9d747960a6da344880ad':
  Revert "Protect LOGIN_ACCOUNTS_CHANGED receiver in SyncManager"

services/core/java/com/android/server/content/SyncManager.java

diff --git a/services/core/java/com/android/server/content/SyncManager.java b/services/core/java/com/android/server/content/SyncManager.java
index adc96f7..6dcbc42 100644
--- a/services/core/java/com/android/server/content/SyncManager.java
+++ b/services/core/java/com/android/server/content/SyncManager.java
@@ -16,7 +16,6 @@
 
 package com.android.server.content;
 
-import android.Manifest;
 import android.accounts.Account;
 import android.accounts.AccountAndUser;
 import android.accounts.AccountManager;
@@ -481,7 +480,7 @@
             mContext.registerReceiverAsUser(mAccountsUpdatedReceiver,
                     UserHandle.ALL,
                     new IntentFilter(AccountManager.LOGIN_ACCOUNTS_CHANGED_ACTION),
-                    Manifest.permission.ACCOUNT_MANAGER, null);
+                    null, null);
         }
 
         // Pick a random second in a day to seed all periodic syncs