commit 2d90fd0eebd611945f30065f21a1a8286aae90d0
author Hyunyoung Song <hyunyoungs@google.com> Wed May 09 23:41:05 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 09 23:41:05 2018 +0000
tree 9a882d06ab307f5698cfdc396664331f58ffb73b
parent 788003e4bf3fb0faf95664936f8f43bc8f0fcf92
parent a30bf371e47e1f8aff1cfd5ac22c2662d5a26d93

Merge "Use device api level if first_api_level is not set. Bug: 79429532" into ub-launcher3-edmonton

quickstep/src/com/android/quickstep/OverviewInteractionState.java

diff --git a/quickstep/src/com/android/quickstep/OverviewInteractionState.java b/quickstep/src/com/android/quickstep/OverviewInteractionState.java
index 9416a29..ad4af62 100644
--- a/quickstep/src/com/android/quickstep/OverviewInteractionState.java
+++ b/quickstep/src/com/android/quickstep/OverviewInteractionState.java
@@ -203,7 +203,12 @@
     }
 
     private boolean shouldIgnoreSwipeUpEnabledSettings() {
-        String sdkInt = getSystemProperty("ro.product.first_api_level", "0");
+        int deviceApiLevel = Build.VERSION.SDK_INT;
+
+        // Note: on factory ROM devices, this first_api_level property is intentionally not set.
+        // deviceApiLevel is used in these case.
+        String sdkInt = getSystemProperty("ro.product.first_api_level",
+                Integer.toString(deviceApiLevel));
         try {
             return Integer.parseInt(sdkInt) >= Build.VERSION_CODES.P;
         } catch (Exception e) {