diff options
| author | Brandon Maxwell <maxwelb@google.com> | 2016-01-14 01:06:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-01-14 01:06:39 +0000 |
| commit | 45794a7d03bbf3e2019c780ed7c25b5de9f5112b (patch) | |
| tree | 55e65eae949794ee35c8fe5446ab9854e4431582 /AndroidManifest.xml | |
| parent | f23ceedc5bb016c71be6d8e7b3153471e05fb220 (diff) | |
| parent | d4947e51b0b3336ff9da03275ff48a7632fe0268 (diff) | |
Merge "Revert "Changes needed to make Incoming calls work while fbe locked"" into ub-contactsdialer-b-dev
am: d4947e51b0
* commit 'd4947e51b0b3336ff9da03275ff48a7632fe0268':
Revert "Changes needed to make Incoming calls work while fbe locked"
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8d63dc139..f6aa4aad4 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -296,8 +296,7 @@ android:launchMode="singleInstance" android:configChanges="keyboardHidden" android:exported="false" - android:screenOrientation="nosensor" - android:encryptionAware="true"> + android:screenOrientation="nosensor" > </activity> <!-- BroadcastReceiver for receiving Intents from Notification mechanism. --> @@ -305,8 +304,7 @@ android:exported="false" /> <service android:name="com.android.incallui.InCallServiceImpl" - android:permission="android.permission.BIND_INCALL_SERVICE" - android:encryptionAware="true"> + android:permission="android.permission.BIND_INCALL_SERVICE" > <meta-data android:name="android.telecom.IN_CALL_SERVICE_UI" android:value="true" /> <intent-filter> <action android:name="android.telecom.InCallService"/> |