commit 70b2cc2c5a9ca7f16c730f7329112416fee0fffd
author Brandon Maxwell <maxwelb@google.com> Tue Jan 12 18:04:43 2016 -0800
committer Brandon Maxwell <maxwelb@google.com> Wed Jan 13 14:45:03 2016 -0800
tree a146af5a282fc91d75d8c931de9c5e00099875be
parent 90a13e94e3d918da73e83d80ab12c6e5f3f76f7e

Changes needed to make Incoming calls work while fbe locked

+ All in-call components are marked as encryptionAware so Telecom can
bind to and use them.
+ Added null checks on cursors. When in FBE locked state,
non-encryption aware ContentProviders return null

Bug=26542121
Change-Id: Ia49536c957d3d721401c05bf638fdd9dd371a731

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 91c91b9..2ec57b9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -294,7 +294,8 @@
                   android:launchMode="singleInstance"
                   android:configChanges="keyboardHidden"
                   android:exported="false"
-                  android:screenOrientation="nosensor" >
+                  android:screenOrientation="nosensor"
+                  android:encryptionAware="true">
         </activity>
 
         <!-- BroadcastReceiver for receiving Intents from Notification mechanism. -->
@@ -302,7 +303,8 @@
                   android:exported="false" />
 
         <service android:name="com.android.incallui.InCallServiceImpl"
-                 android:permission="android.permission.BIND_INCALL_SERVICE" >
+                 android:permission="android.permission.BIND_INCALL_SERVICE"
+                 android:encryptionAware="true">
             <meta-data android:name="android.telecom.IN_CALL_SERVICE_UI" android:value="true" />
             <intent-filter>
                 <action android:name="android.telecom.InCallService"/>