commit 50f38e7e93393ce1ed2b26c77726d0396aea9481
author Selim Gurun <sgurun@google.com> Wed Feb 15 18:33:23 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 15 18:33:23 2012 -0800
tree b6921dbec9c36634a17cb7b317c4b6ceabe5e1b0
parent 0cb57ed171d7898f5f052e86e485771cbcbadcd8

Revert "Broadcast credential storage changes."

This reverts commit 0cb57ed171d7898f5f052e86e485771cbcbadcd8

src/com/android/keychain/KeyChainService.java

diff --git a/src/com/android/keychain/KeyChainService.java b/src/com/android/keychain/KeyChainService.java
index 1ab3ad3..418f575 100644
--- a/src/com/android/keychain/KeyChainService.java
+++ b/src/com/android/keychain/KeyChainService.java
@@ -28,7 +28,6 @@
 import android.os.IBinder;
 import android.security.Credentials;
 import android.security.IKeyChainService;
-import android.security.KeyChain;
 import android.security.KeyStore;
 import android.util.Log;
 import java.io.ByteArrayInputStream;
@@ -40,7 +39,6 @@
 import org.apache.harmony.xnet.provider.jsse.TrustedCertificateStore;
 
 public class KeyChainService extends IntentService {
-
     private static final String TAG = "KeyChain";
 
     private static final String DATABASE_NAME = "grants.db";
@@ -125,7 +123,6 @@
             } catch (CertificateException e) {
                 throw new IllegalStateException(e);
             }
-            broadcastStorageChange();
         }
 
         private X509Certificate parseCertificate(byte[] bytes) throws CertificateException {
@@ -147,20 +144,14 @@
                         }
                     }
                 }
+                return ok;
             }
-            broadcastStorageChange();
-            return ok;
         }
 
         @Override public boolean deleteCaCertificate(String alias) {
             // only Settings should be able to delete
             checkSystemCaller();
-            boolean ok = true;
-            synchronized (mTrustedCertificateStore) {
-                ok = deleteCertificateEntry(alias);
-            }
-            broadcastStorageChange();
-            return ok;
+            return deleteCertificateEntry(alias);
         }
 
         private boolean deleteCertificateEntry(String alias) {
@@ -205,7 +196,6 @@
         @Override public void setGrant(int uid, String alias, boolean value) {
             checkSystemCaller();
             setGrantInternal(mDatabaseHelper.getWritableDatabase(), uid, alias, value);
-            broadcastStorageChange();
         }
     };
 
@@ -299,10 +289,4 @@
             db.endTransaction();
         }
     }
-
-    private void broadcastStorageChange() {
-        Intent intent = new Intent(KeyChain.ACTION_STORAGE_CHANGED);
-        sendBroadcast(intent);
-    }
-
 }