commit 3d670504427b08d6efd96d05401b6a5d5e44742d
author Nanxi Chen <nxchen@google.com> Thu Mar 17 16:32:09 2016 -0700
committer Nanxi Chen <nxchen@google.com> Fri Mar 18 11:14:53 2016 -0700
tree bf2acb50018664fad809433b84e3e062078473a0
parent c3ecad6f0ae5ae9b4148b1f03701e421822f08c4

Make carrier config service binding file-encryption aware.

When the system is not yet unlocked, it should only bind to the service
that is marked as file-encryption aware. It should reevaluate bindings
after system is unlocked.

Bug: b/27380116
Design: go/carrier-config-binding-fbe

Change-Id: Id35102209ded0d84614a076dc649c8eb3516a2af

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 09f12ff..0d04a52 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -93,8 +93,10 @@
     // Service connection for binding to config app.
     private CarrierServiceConnection[] mServiceConnection;
 
+    // Broadcast receiver for Boot intents, register intent filter in construtor.
+    private final BroadcastReceiver mBootReceiver = new ConfigLoaderBroadcastReceiver();
     // Broadcast receiver for SIM and pkg intents, register intent filter in constructor.
-    private final BroadcastReceiver mReceiver = new ConfigLoaderBroadcastReceiver();
+    private final BroadcastReceiver mPackageReceiver = new ConfigLoaderBroadcastReceiver();
 
     // Message codes; see mHandler below.
     // Request from SubscriptionInfoUpdater when SIM becomes absent or error.
@@ -119,6 +121,8 @@
     private static final int EVENT_BIND_CARRIER_TIMEOUT = 11;
     // Check if the system fingerprint has changed.
     private static final int EVENT_CHECK_SYSTEM_UPDATE = 12;
+    // Rerun carrier config binding after system is unlocked.
+    private static final int EVENT_SYSTEM_UNLOCKED = 13;
 
     private static final int BIND_TIMEOUT_MILLIS = 10000;
 
@@ -168,6 +172,12 @@
                     broadcastConfigChangedIntent(phoneId);
                     break;
 
+                case EVENT_SYSTEM_UNLOCKED:
+                    for (int i = 0; i < TelephonyManager.from(mContext).getPhoneCount(); ++i) {
+                        updateConfigForPhoneId(i);
+                    }
+                    break;
+
                 case EVENT_PACKAGE_CHANGED:
                     carrierPackageName = (String) msg.obj;
                     // Only update if there are cached config removed to avoid updating config
@@ -334,6 +344,10 @@
     private CarrierConfigLoader(Context context) {
         mContext = context;
 
+        IntentFilter bootFilter = new IntentFilter();
+        bootFilter.addAction(Intent.ACTION_BOOT_COMPLETED);
+        context.registerReceiver(mBootReceiver, bootFilter);
+
         // Register for package updates. Update app or uninstall app update will have all 3 intents,
         // in the order or removed, added, replaced, all with extra_replace set to true.
         IntentFilter pkgFilter = new IntentFilter();
@@ -341,7 +355,7 @@
         pkgFilter.addAction(Intent.ACTION_PACKAGE_REMOVED);
         pkgFilter.addAction(Intent.ACTION_PACKAGE_REPLACED);
         pkgFilter.addDataScheme("package");
-        context.registerReceiverAsUser(mReceiver, UserHandle.ALL, pkgFilter, null, null);
+        context.registerReceiverAsUser(mPackageReceiver, UserHandle.ALL, pkgFilter, null, null);
 
         int numPhones = TelephonyManager.from(context).getPhoneCount();
         mConfigFromDefaultApp = new PersistableBundle[numPhones];
@@ -732,6 +746,10 @@
                 return;
 
             switch (action) {
+                case Intent.ACTION_BOOT_COMPLETED:
+                    mHandler.sendMessage(mHandler.obtainMessage(EVENT_SYSTEM_UNLOCKED, null));
+                    break;
+
                 case Intent.ACTION_PACKAGE_ADDED:
                 case Intent.ACTION_PACKAGE_REMOVED:
                 case Intent.ACTION_PACKAGE_REPLACED: