diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2016-03-17 22:14:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-03-17 22:14:00 +0000 |
| commit | 301a724210cf9ed69b68c5cab92e87a7cccb73f4 (patch) | |
| tree | 6ebe27eb57376aeadce261bf79c770071b144962 | |
| parent | ad6fbc0f594341d23f33ccf73c765e9b2dc9adab (diff) | |
| parent | 8196a91d00afb10864d43bc9433bc08b355a03bd (diff) | |
Merge "Follow framework refactoring." into nyc-dev
am: 8196a91
* commit '8196a91d00afb10864d43bc9433bc08b355a03bd':
Follow framework refactoring.
| -rw-r--r-- | AndroidManifest.xml | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index ae64e2fa0..8892c24c1 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -68,8 +68,7 @@ android:hardwareAccelerated="true" android:supportsRtl="true" android:backupAgent='com.android.dialer.DialerBackupAgent' - android:usesCleartextTraffic="false" - android:forceDeviceEncrypted="false"> + android:usesCleartextTraffic="false"> <meta-data android:name="com.google.android.backup.api_key" android:value="AEdPqrEAAAAIBXgtCEKQ6W0PXVnW-ZVia2KmlV2AxsTw3GjAeQ" /> @@ -85,8 +84,7 @@ android:icon="@mipmap/ic_launcher_phone" android:windowSoftInputMode="stateAlwaysHidden|adjustNothing" android:resizeableActivity="true" - android:encryptionAware="true" - > + android:directBootAware="true"> <intent-filter> <action android:name="android.intent.action.DIAL" /> <category android:name="android.intent.category.DEFAULT" /> @@ -281,12 +279,12 @@ <service android:name=".calllog.CallLogNotificationsService" - android:encryptionAware="true" + android:directBootAware="true" android:exported="false" /> <receiver android:name=".calllog.MissedCallNotificationReceiver" - android:encryptionAware="true"> + android:directBootAware="true"> <intent-filter> <action android:name="android.telecom.action.SHOW_MISSED_CALLS_NOTIFICATION" /> </intent-filter> @@ -316,13 +314,13 @@ android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboardHidden" android:exported="false" android:screenOrientation="nosensor" - android:encryptionAware="true" + android:directBootAware="true" android:resizeableActivity="true"> </activity> <service android:name="com.android.incallui.InCallServiceImpl" android:permission="android.permission.BIND_INCALL_SERVICE" - android:encryptionAware="true" > + android:directBootAware="true" > <meta-data android:name="android.telecom.IN_CALL_SERVICE_UI" android:value="true" /> <meta-data android:name="android.telecom.IN_CALL_SERVICE_RINGING" android:value="false"/> @@ -333,7 +331,7 @@ <!-- BroadcastReceiver for receiving Intents from Notification mechanism. --> <receiver android:name="com.android.incallui.NotificationBroadcastReceiver" - android:encryptionAware="true" + android:directBootAware="true" android:exported="false" /> <provider |