PhoneFactory: Block radio init if the device's custom class can't be used

Trap the initialization process in a 10 second error loop. The device
will be normally usable, and have a dead radio. The radio log buffer
will have the full stack dump explaining what went wrong during the
custom class instantiation

Change-Id: Id47d51737a9fb78e6d43a179ba304b1ba03c4219

1 files changed, 6 insertions, 2 deletions

diff --git a/src/java/com/android/internal/telephony/PhoneFactory.java b/src/java/com/android/internal/telephony/PhoneFactory.java
index ab28ff2a4..f46f82835 100644
--- a/src/java/com/android/internal/telephony/PhoneFactory.java
+++ b/src/java/com/android/internal/telephony/PhoneFactory.java
@@ -127,8 +127,12 @@ public class PhoneFactory {
                 } catch (Exception e) {
                     // 6 different types of exceptions are thrown here that it's
                     // easier to just catch Exception as our "error handling" is the same.
-                    Rlog.e(LOG_TAG, "Unable to construct custom RIL class", e);
-                    sCommandsInterface = new RIL(context, networkMode, cdmaSubscription);
+                    // Yes, we're blocking the whole thing and making the radio unusable. That's by design.
+                    // The log message should make it clear why the radio is broken
+                    while (true) {
+                        Rlog.e(LOG_TAG, "Unable to construct custom RIL class", e);
+                        try {Thread.sleep(10000);} catch (InterruptedException ie) {}
+                    }
                 }
 
                 // Instantiate UiccController so that all other classes can just call getInstance()