diff options
| author | Bryce Lee <brycelee@google.com> | 2017-08-16 17:30:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-16 17:30:43 +0000 |
| commit | 92a84efba1405b856661423cb133cd9d4140116b (patch) | |
| tree | f4937d3c897246962715ba21ea71611d2900a0ab /core/java/android | |
| parent | 7fc53a11f839b1cbe779d4132f10aaa495ab3176 (diff) | |
| parent | 0e7b7c96be5e61f519ab2e5a258fa17d9c32efcb (diff) | |
Merge "Update references to O MR1 to proper codename." into oc-mr1-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/Activity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 1c8a37606ffe..2166c3c74470 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -16,7 +16,7 @@ package android.app; -import static android.os.Build.VERSION_CODES.O; +import static android.os.Build.VERSION_CODES.O_MR1; import static java.lang.Character.MIN_VALUE; @@ -973,7 +973,7 @@ public class Activity extends ContextThemeWrapper protected void onCreate(@Nullable Bundle savedInstanceState) { if (DEBUG_LIFECYCLE) Slog.v(TAG, "onCreate " + this + ": " + savedInstanceState); - if (getApplicationInfo().targetSdkVersion > O && mActivityInfo.isFixedOrientation()) { + if (getApplicationInfo().targetSdkVersion >= O_MR1 && mActivityInfo.isFixedOrientation()) { final TypedArray ta = obtainStyledAttributes(com.android.internal.R.styleable.Window); final boolean isTranslucentOrFloating = ActivityInfo.isTranslucentOrFloating(ta); ta.recycle(); |