Skip to content

Commit 29e5b14

Browse files
committed
Update targetSdkVersion for Q release.
Test: Manual Fixes: 132879348 Change-Id: I4fe1124f59c789458b55f48eacbd8f55ec2adb8d
1 parent 9403db0 commit 29e5b14

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ android {
1919
defaultConfig {
2020
applicationId "com.afwsamples.testdpc"
2121
minSdkVersion 21
22-
targetSdkVersion 'Q'
22+
targetSdkVersion 29
2323
versionCode versionMajor * 1000 + versionMinor * 100 + versionBuild
2424
versionName "${versionMajor}.${versionMinor}.${versionBuild}"
2525
multiDexEnabled true

app/src/main/res/values/attrs.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<enum name="O" value="26" />
2929
<enum name="O_MR1" value="27" />
3030
<enum name="P" value="28" />
31-
<enum name="Q" value="10000" />
31+
<enum name="Q" value="29" />
3232
</attr>
3333

3434
<!-- Constrain a preference to DO or PO admins. -->

app/src/main/res/xml/device_policy_header.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<com.afwsamples.testdpc.common.preference.DpcPreference
8282
android:key="cross_profile_calendar"
8383
android:title="@string/cross_profile_calendar"
84-
testdpc:admin="any"
84+
testdpc:admin="deviceOwner|profileOwner"
8585
testdpc:minSdkVersion="Q" />
8686
</PreferenceCategory>
8787

0 commit comments

Comments
 (0)