Merge "Force work challenge activity to be not resizable" into nyc-dev am: 06a1d61 am: 41893d6

am: 8af909e

* commit '8af909ed9465bc69ed58c4d880660f8885322b5a':
  Force work challenge activity to be not resizable

Change-Id: Icb90f5f2ebf9c9578ac56cf739099b36a63073ba
This commit is contained in:
Tony Mak
2016-04-18 16:01:11 +00:00
committed by android-build-merger

View File

@@ -1558,6 +1558,7 @@
<activity android:name="ConfirmDeviceCredentialActivity$InternalActivity"
android:exported="false"
android:permission="android.permission.MANAGE_USERS"
android:resizeableActivity="false"
android:theme="@android:style/Theme.NoDisplay">
<intent-filter android:priority="1">
<action android:name="android.app.action.CONFIRM_DEVICE_CREDENTIAL_WITH_USER" />