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

am: 41893d6

* commit '41893d65097804eda078f29bc269c3694b6341be':
  Force work challenge activity to be not resizable

Change-Id: I8b453cd1676ace63601e5b67df22eb47030e1c35
This commit is contained in:
Tony Mak
2016-04-18 15:47:53 +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" />