commit e2551064d2a048a39d01cabfb8395e69cdcffab7
author Hemant Gupta <hemantg@codeaurora.org> Tue Feb 13 22:45:38 2018 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 13 22:45:38 2018 +0000
tree e019f8f8a68e1df9f58b54504fff7337f0332f67
parent 2e0de6bb41e183921c2ddaf173c473b7610db459
parent 6385eb1014dc169175a4b000000f6decef06d978

Merge "OPP: Prevent sending intent while orientation change" am: f32fa0b5f6 am: def626bea0
am: 6385eb1014

Change-Id: I2589be4755ca02d2ff1265607c735ca2cf1332d1

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index dec12ba..5e4f1e8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -461,6 +461,7 @@
 
         <activity android:name=".bluetooth.DevicePickerActivity"
                 android:label="@string/device_picker"
+                android:configChanges="orientation|keyboardHidden|screenSize"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.bluetooth.devicepicker.action.LAUNCH" />