diff options
author | Selim Gurun <sgurun@google.com> | 2012-02-15 18:32:59 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-15 18:32:59 -0800 |
commit | 3ffb8e337e96c074ad70853cc6e4d1d5c4b03f95 (patch) | |
tree | b6921dbec9c36634a17cb7b317c4b6ceabe5e1b0 /src | |
parent | 0cb57ed171d7898f5f052e86e485771cbcbadcd8 (diff) | |
download | android_packages_apps_KeyChain-3ffb8e337e96c074ad70853cc6e4d1d5c4b03f95.tar.gz android_packages_apps_KeyChain-3ffb8e337e96c074ad70853cc6e4d1d5c4b03f95.tar.bz2 android_packages_apps_KeyChain-3ffb8e337e96c074ad70853cc6e4d1d5c4b03f95.zip |
Revert "Broadcast credential storage changes."
This reverts commit 0cb57ed171d7898f5f052e86e485771cbcbadcd8
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/keychain/KeyChainService.java | 20 |
1 files changed, 2 insertions, 18 deletions
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.database.sqlite.SQLiteOpenHelper; 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 java.security.cert.X509Certificate; 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 @@ public class KeyChainService extends IntentService { } catch (CertificateException e) { throw new IllegalStateException(e); } - broadcastStorageChange(); } private X509Certificate parseCertificate(byte[] bytes) throws CertificateException { @@ -147,20 +144,14 @@ public class KeyChainService extends IntentService { } } } + 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 @@ public class KeyChainService extends IntentService { @Override public void setGrant(int uid, String alias, boolean value) { checkSystemCaller(); setGrantInternal(mDatabaseHelper.getWritableDatabase(), uid, alias, value); - broadcastStorageChange(); } }; @@ -299,10 +289,4 @@ public class KeyChainService extends IntentService { db.endTransaction(); } } - - private void broadcastStorageChange() { - Intent intent = new Intent(KeyChain.ACTION_STORAGE_CHANGED); - sendBroadcast(intent); - } - } |