Skip to content

Commit a47cdfb

Browse files
committed
Merge branch 'release' of /usr/local/google/home/ascull/projects/ub-testdpc-oc-release/vendor/unbundled_google/packages/TestDPC into new-version
2 parents 41897d9 + c50afdb commit a47cdfb

File tree

4 files changed

+14
-3
lines changed

4 files changed

+14
-3
lines changed

app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ext {
77
// exactly 1 digit
88
versionMinor = 0
99
// exactly 2 digits
10-
versionBuild = 01
10+
versionBuild = 02
1111
}
1212

1313
android {

app/src/main/AndroidManifest.xml

+4-2
Original file line numberDiff line numberDiff line change
@@ -137,14 +137,16 @@
137137
</receiver>
138138

139139
<receiver android:name=".policy.resetpassword.ResetPasswordService$LockedBootCompletedReceiver"
140-
android:directBootAware="true" >
140+
android:enabled="@bool/is_o_or_later"
141+
android:directBootAware="true" >
141142
<intent-filter>
142143
<action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
143144
</intent-filter>
144145
</receiver>
145146

146147
<service android:name=".policy.resetpassword.ResetPasswordService"
147-
android:directBootAware="true" >
148+
android:enabled="@bool/is_o_or_later"
149+
android:directBootAware="true" >
148150
</service>
149151

150152
<provider

app/src/main/res/values-v26/bool.xml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<bool name="is_o_or_later">true</bool>
4+
</resources>

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

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<bool name="is_o_or_later">false</bool>
4+
</resources>
5+

0 commit comments

Comments
 (0)