Skip to content

Commit 8076038

Browse files
author
Rubin Xu
committed
Revert "Password blacklist"
Bug: 73750934 Test: compiles Change-Id: I0dd16073a9fe590d5fb04731b9ecc65f216f96eb
1 parent 26e1e22 commit 8076038

File tree

6 files changed

+15
-348
lines changed

6 files changed

+15
-348
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
<uses-permission android:name="android.permission.INTERNET" />
2727
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
2828
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
29-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
3029

3130
<application
3231
android:allowBackup="true"

app/src/main/java/com/afwsamples/testdpc/common/Util.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -165,17 +165,12 @@ public static List<UserHandle> getBindDeviceAdminTargetUsers(Context context) {
165165

166166
public static void showFileViewerForImportingCertificate(PreferenceFragment fragment,
167167
int requestCode) {
168-
showFilePicker(fragment, "*/*", requestCode);
169-
}
170-
171-
public static void showFilePicker(PreferenceFragment fragment, String type, int requestCode) {
172-
Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
173-
intent.addCategory(Intent.CATEGORY_OPENABLE);
174-
intent.setTypeAndNormalize(type);
168+
Intent certIntent = new Intent(Intent.ACTION_GET_CONTENT);
169+
certIntent.setTypeAndNormalize("*/*");
175170
try {
176-
fragment.startActivityForResult(intent, requestCode);
171+
fragment.startActivityForResult(certIntent, requestCode);
177172
} catch (ActivityNotFoundException e) {
178-
Log.e(TAG, "showFilePicker: ", e);
173+
Log.e(TAG, "showFileViewerForImportingCertificate: ", e);
179174
}
180175
}
181176

app/src/main/java/com/afwsamples/testdpc/policy/keyguard/PasswordBlacklistFragment.java

Lines changed: 0 additions & 191 deletions
This file was deleted.

0 commit comments

Comments
 (0)