Skip to content

Commit 13783b5

Browse files
committed
Remove use of ReflectionUtil.
Test: manual Change-Id: I3ee57eab41bf301f8264172a9312b1ec0db1a5fa
1 parent 358d453 commit 13783b5

File tree

2 files changed

+21
-39
lines changed

2 files changed

+21
-39
lines changed

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

Lines changed: 21 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
package com.afwsamples.testdpc.policy;
1818

1919
import static android.os.UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES;
20-
import static com.afwsamples.testdpc.common.ReflectionUtil.intConstant;
21-
import static com.afwsamples.testdpc.common.ReflectionUtil.invoke;
22-
import static com.afwsamples.testdpc.common.ReflectionUtil.stringConstant;
2320
import static com.afwsamples.testdpc.common.Util.isAtLeastQ;
2421
import static com.afwsamples.testdpc.common.preference.DpcPreferenceHelper.NO_CUSTOM_CONSTRIANT;
2522

@@ -99,7 +96,6 @@
9996
import com.afwsamples.testdpc.common.CertificateUtil;
10097
import com.afwsamples.testdpc.common.MediaDisplayFragment;
10198
import com.afwsamples.testdpc.common.PackageInstallationUtils;
102-
import com.afwsamples.testdpc.common.ReflectionUtil.ReflectionIsTemporaryException;
10399
import com.afwsamples.testdpc.common.UserArrayAdapter;
104100
import com.afwsamples.testdpc.common.Util;
105101
import com.afwsamples.testdpc.common.preference.CustomConstraint;
@@ -401,26 +397,22 @@ public class PolicyManagementFragment extends BaseSearchablePolicyPreferenceFrag
401397
private static final SparseIntArray PASSWORD_COMPLEXITY = new SparseIntArray(4);
402398
static {
403399
if (isAtLeastQ()) {
404-
try {
405-
final int[] complexityIds = new int[]{
406-
intConstant(DevicePolicyManager.class, "PASSWORD_COMPLEXITY_NONE"),
407-
intConstant(DevicePolicyManager.class, "PASSWORD_COMPLEXITY_LOW"),
408-
intConstant(DevicePolicyManager.class, "PASSWORD_COMPLEXITY_MEDIUM"),
409-
intConstant(DevicePolicyManager.class, "PASSWORD_COMPLEXITY_HIGH")
410-
};
411-
412-
// Strings to show for each password complexity setting.
413-
final int[] complexityNames = new int[]{
414-
R.string.password_complexity_none,
415-
R.string.password_complexity_low,
416-
R.string.password_complexity_medium,
417-
R.string.password_complexity_high
418-
};
419-
for (int i = 0; i < complexityIds.length; i++) {
420-
PASSWORD_COMPLEXITY.put(complexityIds[i], complexityNames[i]);
421-
}
422-
} catch (ReflectionIsTemporaryException e) {
423-
Log.e(TAG, "Cannot get password complexity constants.", e);
400+
final int[] complexityIds = new int[]{
401+
DevicePolicyManager.PASSWORD_COMPLEXITY_NONE,
402+
DevicePolicyManager.PASSWORD_COMPLEXITY_LOW,
403+
DevicePolicyManager.PASSWORD_COMPLEXITY_MEDIUM,
404+
DevicePolicyManager.PASSWORD_COMPLEXITY_HIGH
405+
};
406+
407+
// Strings to show for each password complexity setting.
408+
final int[] complexityNames = new int[]{
409+
R.string.password_complexity_none,
410+
R.string.password_complexity_low,
411+
R.string.password_complexity_medium,
412+
R.string.password_complexity_high
413+
};
414+
for (int i = 0; i < complexityIds.length; i++) {
415+
PASSWORD_COMPLEXITY.put(complexityIds[i], complexityNames[i]);
424416
}
425417
}
426418
}
@@ -1329,13 +1321,9 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
13291321
return true;
13301322
case SET_NEW_PASSWORD_WITH_COMPLEXITY:
13311323
Intent intent = new Intent(DevicePolicyManager.ACTION_SET_NEW_PASSWORD);
1332-
try {
1333-
intent.putExtra(
1334-
stringConstant(DevicePolicyManager.class, "EXTRA_PASSWORD_COMPLEXITY"),
1335-
Integer.parseInt((String) newValue));
1336-
} catch (ReflectionIsTemporaryException e) {
1337-
Log.e(TAG, "Cannot get EXTRA_PASSWORD_COMPLEXITY.", e);
1338-
}
1324+
intent.putExtra(
1325+
DevicePolicyManager.EXTRA_PASSWORD_COMPLEXITY,
1326+
Integer.parseInt((String) newValue));
13391327
startActivity(intent);
13401328
return true;
13411329
}
@@ -2145,13 +2133,8 @@ private void loadPasswordComplexity() {
21452133
return;
21462134
}
21472135

2148-
try {
2149-
int complexity =
2150-
(int) invoke(mDevicePolicyManager, "getPasswordComplexity");
2151-
passwordComplexityPreference.setSummary(PASSWORD_COMPLEXITY.get(complexity));
2152-
} catch (ReflectionIsTemporaryException e) {
2153-
Log.e(TAG, "Cannot get password complexity.", e);
2154-
}
2136+
int complexity = mDevicePolicyManager.getPasswordComplexity();
2137+
passwordComplexityPreference.setSummary(PASSWORD_COMPLEXITY.get(complexity));
21552138
}
21562139

21572140
@TargetApi(Build.VERSION_CODES.N)

app/src/main/java/com/afwsamples/testdpc/policy/locktask/SetLockTaskFeaturesFragment.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import com.afwsamples.testdpc.DeviceAdminReceiver;
3636
import com.afwsamples.testdpc.R;
3737
import com.afwsamples.testdpc.common.BaseSearchablePolicyPreferenceFragment;
38-
import com.afwsamples.testdpc.common.ReflectionUtil;
3938
import com.afwsamples.testdpc.common.preference.DpcSwitchPreference;
4039
import java.util.Map;
4140

0 commit comments

Comments
 (0)