Skip to content

Commit 43b95ee

Browse files
author
yuemingw
committed
Rename DISALLOW_CONFIG_LOCATION_MODE to DISALLOW_CONFIG_LOCATION.
Bug: 72732481 Test: CtsVerifier test already in Change-Id: I00bfa4444a6385df2dc9b4181512d99042cf7316
1 parent 2767b2f commit 43b95ee

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

app/src/main/java/com/afwsamples/testdpc/policy/UserRestriction.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import static android.os.UserManager.DISALLOW_CONFIG_CELL_BROADCASTS;
1313
import static android.os.UserManager.DISALLOW_CONFIG_CREDENTIALS;
1414
import static android.os.UserManager.DISALLOW_CONFIG_DATE_TIME;
15-
import static android.os.UserManager.DISALLOW_CONFIG_LOCATION_MODE;
1615
import static android.os.UserManager.DISALLOW_AIRPLANE_MODE;
1716
import static android.os.UserManager.DISALLOW_CONFIG_BRIGHTNESS;
1817
import static android.os.UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT;
@@ -52,6 +51,7 @@
5251
public class UserRestriction {
5352
// TODO: remove it once available in SDK
5453
public static final String DISALLOW_UNIFIED_PASSWORD = "no_unified_password";
54+
public static final String DISALLOW_CONFIG_LOCATION = "no_config_location";
5555

5656
public String key;
5757
public int titleResId;
@@ -178,8 +178,8 @@ public UserRestriction(String key, int titleResId) {
178178
new UserRestriction(DISALLOW_UNIFIED_PASSWORD, R.string.disallow_unified_password),
179179
new UserRestriction(DISALLOW_USER_SWITCH, R.string.disallow_user_switch),
180180
new UserRestriction(
181-
DISALLOW_CONFIG_LOCATION_MODE,
182-
R.string.disallow_config_location_mode),
181+
DISALLOW_CONFIG_LOCATION,
182+
R.string.disallow_config_location),
183183
new UserRestriction(
184184
DISALLOW_AIRPLANE_MODE,
185185
R.string.disallow_airplane_mode),
@@ -285,7 +285,7 @@ public UserRestriction(String key, int titleResId) {
285285
DISALLOW_UNIFIED_PASSWORD,
286286
DISALLOW_SYSTEM_ERROR_DIALOGS,
287287
DISALLOW_USER_SWITCH,
288-
DISALLOW_CONFIG_LOCATION_MODE,
288+
DISALLOW_CONFIG_LOCATION,
289289
DISALLOW_AIRPLANE_MODE,
290290
DISALLOW_CONFIG_DATE_TIME,
291291
DISALLOW_CONFIG_BRIGHTNESS,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@
423423
<string name="disallow_autofill">Disallow autofill</string>
424424
<string name="disallow_unified_password">Require separate challenge</string>
425425
<string name="disallow_user_switch">Disallow user switch</string>
426-
<string name="disallow_config_location_mode">Disallow config location mode</string>
426+
<string name="disallow_config_location">Disallow config location</string>
427427
<string name="disallow_airplane_mode">Disallow airplane mode</string>
428428
<string name="disallow_config_brightness">Disallow config brightness</string>
429429
<string name="disallow_config_date_time">Disallow config date time</string>

0 commit comments

Comments
 (0)