commit 2099a7d98f1b99afa3331eff2410fbc15cab47bc
author Chad Brubaker <cbrubaker@google.com> Mon May 02 13:13:23 2016 -0700
committer Chad Brubaker <cbrubaker@google.com> Thu Jun 30 09:12:49 2016 -0700
tree 46efc3f831339092be3f80498d6072ef4f916fb7
parent f88f40660e717483b8b3138fa8239b6e7f5bcc2a

Deprecate ACTION_STORAGE_CHANGED

ACTION_STORAGE_CHANGED is too noisy and fires on too many events. It has
been split into ACTION_KEYCHAIN_CHANGED for
addition/modification/removal of user certificates and key and
ACTION_TRUST_STORE_CHANGED for changes the the user added and system CA
stores on the device.

ACTION_STORAGE_CHANGED will only be sent to applications targeting N
and below. Applications targeting future releases should use the new
broadcasts.

Bug:28450538
Change-Id: Iad71c35a5f6d7e4475ad2fcbe2e11189b26bdb54

src/com/android/keychain/KeyChainService.java

diff --git a/src/com/android/keychain/KeyChainService.java b/src/com/android/keychain/KeyChainService.java
index 1d21fe5..8b3dcda 100644
--- a/src/com/android/keychain/KeyChainService.java
+++ b/src/com/android/keychain/KeyChainService.java
@@ -16,6 +16,7 @@
 
 package com.android.keychain;
 
+import android.app.BroadcastOptions;
 import android.app.IntentService;
 import android.content.ContentValues;
 import android.content.Context;
@@ -27,6 +28,7 @@
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.os.Binder;
+import android.os.Build;
 import android.os.IBinder;
 import android.os.Process;
 import android.os.UserHandle;
@@ -151,7 +153,8 @@
             } catch (CertificateException e) {
                 throw new IllegalStateException(e);
             }
-            broadcastStorageChange();
+            broadcastLegacyStorageChange();
+            broadcastTrustStoreChange();
         }
 
         /**
@@ -198,7 +201,8 @@
                     return false;
                 }
             }
-            broadcastStorageChange();
+            broadcastKeychainChange();
+            broadcastLegacyStorageChange();
             return true;
         }
 
@@ -208,7 +212,8 @@
                 return false;
             }
             removeGrantsForAlias(alias);
-            broadcastStorageChange();
+            broadcastKeychainChange();
+            broadcastLegacyStorageChange();
             return true;
         }
 
@@ -232,7 +237,8 @@
                     }
                 }
             }
-            broadcastStorageChange();
+            broadcastTrustStoreChange();
+            broadcastLegacyStorageChange();
             return ok;
         }
 
@@ -243,7 +249,8 @@
             synchronized (mTrustedCertificateStore) {
                 ok = deleteCertificateEntry(alias);
             }
-            broadcastStorageChange();
+            broadcastTrustStoreChange();
+            broadcastLegacyStorageChange();
             return ok;
         }
 
@@ -289,7 +296,8 @@
         @Override public void setGrant(int uid, String alias, boolean value) {
             checkSystemCaller();
             setGrantInternal(mDatabaseHelper.getWritableDatabase(), uid, alias, value);
-            broadcastStorageChange();
+            broadcastPermissionChange(uid, alias, value);
+            broadcastLegacyStorageChange();
         }
 
         private ParceledListSlice<ParcelableString> makeAliasesParcelableSynchronised(
@@ -465,9 +473,37 @@
         }
     }
 
-    private void broadcastStorageChange() {
+    private void broadcastLegacyStorageChange() {
         Intent intent = new Intent(KeyChain.ACTION_STORAGE_CHANGED);
-        sendBroadcastAsUser(intent, new UserHandle(UserHandle.myUserId()));
+        BroadcastOptions opts = BroadcastOptions.makeBasic();
+        // TODO: Make this N-MR1 once N-MR1 API is available.
+        opts.setMaxManifestReceiverApiLevel(Build.VERSION_CODES.N);
+        sendBroadcast(intent, null, opts.toBundle());
     }
 
+    private void broadcastKeychainChange() {
+        Intent intent = new Intent(KeyChain.ACTION_KEYCHAIN_CHANGED);
+        sendBroadcast(intent);
+    }
+
+    private void broadcastTrustStoreChange() {
+        Intent intent = new Intent(KeyChain.ACTION_TRUST_STORE_CHANGED);
+        sendBroadcast(intent);
+    }
+
+    private void broadcastPermissionChange(int uid, String alias, boolean access) {
+        // Since the permission change only impacts one uid only send to that uid's packages.
+        final PackageManager packageManager = getPackageManager();
+        String[] packages = packageManager.getPackagesForUid(uid);
+        if (packages == null) {
+            return;
+        }
+        for (String pckg : packages) {
+            Intent intent = new Intent(KeyChain.ACTION_KEY_ACCESS_CHANGED);
+            intent.putExtra(KeyChain.EXTRA_KEY_ALIAS, alias);
+            intent.putExtra(KeyChain.EXTRA_KEY_ACCESSIBLE, access);
+            intent.setPackage(pckg);
+            sendBroadcast(intent);
+        }
+    }
 }