diff options
| -rw-r--r-- | core/java/android/app/BackStackRecord.java | 4 | ||||
| -rw-r--r-- | core/java/android/os/Build.java | 12 |
2 files changed, 3 insertions, 13 deletions
diff --git a/core/java/android/app/BackStackRecord.java b/core/java/android/app/BackStackRecord.java index cf794c5b410e..6b16e8f61e14 100644 --- a/core/java/android/app/BackStackRecord.java +++ b/core/java/android/app/BackStackRecord.java @@ -349,7 +349,9 @@ final class BackStackRecord extends FragmentTransaction implements public BackStackRecord(FragmentManagerImpl manager) { mManager = manager; - mAllowOptimization = Build.isAtLeastO(); + int targetSdkVersion = manager.mHost.getContext().getApplicationInfo().targetSdkVersion; + // TODO: make the check N_MR1 or O + mAllowOptimization = targetSdkVersion > Build.VERSION_CODES.N; } public int getId() { diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index e5832c8064d3..0d6d36961750 100644 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -924,16 +924,4 @@ public class Build { return -1; } } - - /** - * Check if the device is running on the Android O release or newer. - * - * @return {@code true} if O APIs are available for use - * - * @hide - */ - public static boolean isAtLeastO() { - return !"REL".equals(VERSION.CODENAME) - && "O".compareTo(VERSION.CODENAME) <= 0; - } } |