Skip to content

Commit f41a38c

Browse files
author
Marcel Schnelle
committed
Remove references to Build.VERSION_CODES in PermissionUtils, so that there isn't any issue with the test suites
1 parent e5d9090 commit f41a38c

File tree

2 files changed

+8
-14
lines changed

2 files changed

+8
-14
lines changed

library/src/main/android/permissions/dispatcher/PermissionUtils.java

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package permissions.dispatcher;
22

3-
import android.Manifest;
43
import android.app.Activity;
54
import android.content.Context;
65
import android.content.Intent;
@@ -12,11 +11,6 @@
1211
import android.support.v4.app.ActivityCompat;
1312
import android.support.v4.util.SimpleArrayMap;
1413

15-
import static android.os.Build.VERSION_CODES.FROYO;
16-
import static android.os.Build.VERSION_CODES.GINGERBREAD;
17-
import static android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH;
18-
import static android.os.Build.VERSION_CODES.KITKAT_WATCH;
19-
import static android.os.Build.VERSION_CODES.JELLY_BEAN;
2014
import static android.support.v4.content.PermissionChecker.checkSelfPermission;
2115

2216
public final class PermissionUtils {
@@ -26,12 +20,12 @@ public final class PermissionUtils {
2620
private static final SimpleArrayMap<String, Integer> MIN_SDK_PERMISSIONS;
2721
static {
2822
MIN_SDK_PERMISSIONS = new SimpleArrayMap<>(6);
29-
MIN_SDK_PERMISSIONS.put(Manifest.permission.ADD_VOICEMAIL, ICE_CREAM_SANDWICH);
30-
MIN_SDK_PERMISSIONS.put(Manifest.permission.BODY_SENSORS, KITKAT_WATCH);
31-
MIN_SDK_PERMISSIONS.put(Manifest.permission.READ_CALL_LOG, JELLY_BEAN);
32-
MIN_SDK_PERMISSIONS.put(Manifest.permission.READ_EXTERNAL_STORAGE, JELLY_BEAN);
33-
MIN_SDK_PERMISSIONS.put(Manifest.permission.USE_SIP, GINGERBREAD);
34-
MIN_SDK_PERMISSIONS.put(Manifest.permission.WRITE_CALL_LOG, JELLY_BEAN);
23+
MIN_SDK_PERMISSIONS.put("com.android.voicemail.permission.ADD_VOICEMAIL", 14);
24+
MIN_SDK_PERMISSIONS.put("android.permission.BODY_SENSORS", 20);
25+
MIN_SDK_PERMISSIONS.put("android.permission.READ_CALL_LOG", 16);
26+
MIN_SDK_PERMISSIONS.put("android.permission.READ_EXTERNAL_STORAGE", 16);
27+
MIN_SDK_PERMISSIONS.put("android.permission.USE_SIP", 9);
28+
MIN_SDK_PERMISSIONS.put("android.permission.WRITE_CALL_LOG", 16);
3529
}
3630

3731
private PermissionUtils() {
@@ -109,7 +103,7 @@ public static boolean shouldShowRequestPermissionRationale(Activity activity, St
109103
public static @Nullable Intent createAppSettingsIntent(Context context) {
110104
Intent intent;
111105
String packageName = context.getPackageName();
112-
if (Build.VERSION.SDK_INT >= GINGERBREAD) {
106+
if (Build.VERSION.SDK_INT >= 9) {
113107
// Utilize the dedicated Settings Action on API 9+
114108
intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
115109
Uri uri = Uri.fromParts("package", packageName, null);
@@ -120,7 +114,7 @@ public static boolean shouldShowRequestPermissionRationale(Activity activity, St
120114
intent = new Intent(Intent.ACTION_VIEW);
121115
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
122116
intent.setClassName("com.android.settings", "com.android.settings.InstalledAppDetails");
123-
String extraKey = Build.VERSION.SDK_INT == FROYO ? "pkg" : "com.android.settings.ApplicationPkgName";
117+
String extraKey = Build.VERSION.SDK_INT == 8 ? "pkg" : "com.android.settings.ApplicationPkgName";
124118
intent.putExtra(extraKey, packageName);
125119
}
126120

1.01 KB
Binary file not shown.

0 commit comments

Comments
 (0)