diff options
| -rw-r--r-- | core/java/android/view/SurfaceView.java | 2 | ||||
| -rw-r--r-- | core/java/android/view/ViewTreeObserver.java | 2 | ||||
| -rw-r--r-- | core/java/android/webkit/UserPackage.java | 3 | ||||
| -rw-r--r-- | core/java/android/widget/DayPickerView.java | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 4 |
5 files changed, 7 insertions, 8 deletions
diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java index 9cea4ed12392..2c33b60b98b5 100644 --- a/core/java/android/view/SurfaceView.java +++ b/core/java/android/view/SurfaceView.java @@ -856,7 +856,7 @@ public class SurfaceView extends View implements ViewRootImpl.WindowStoppedCallb */ @Deprecated public void setWindowType(int type) { - if (getContext().getApplicationInfo().targetSdkVersion > Build.VERSION_CODES.N_MR1) { + if (getContext().getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.O) { throw new UnsupportedOperationException( "SurfaceView#setWindowType() has never been a public API."); } diff --git a/core/java/android/view/ViewTreeObserver.java b/core/java/android/view/ViewTreeObserver.java index e4d4e7b8b8c5..0973d0aa9b90 100644 --- a/core/java/android/view/ViewTreeObserver.java +++ b/core/java/android/view/ViewTreeObserver.java @@ -334,7 +334,7 @@ public final class ViewTreeObserver { */ ViewTreeObserver(Context context) { sIllegalOnDrawModificationIsFatal = - context.getApplicationInfo().targetSdkVersion > Build.VERSION_CODES.N_MR1; + context.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.O; } /** diff --git a/core/java/android/webkit/UserPackage.java b/core/java/android/webkit/UserPackage.java index f53b5d6a7cd7..892008948e87 100644 --- a/core/java/android/webkit/UserPackage.java +++ b/core/java/android/webkit/UserPackage.java @@ -83,8 +83,7 @@ public class UserPackage { * supported by the current framework version. */ public static boolean hasCorrectTargetSdkVersion(PackageInfo packageInfo) { - // TODO(gsennton) use Build.VERSION_CODES.O when that has been updated. - return packageInfo.applicationInfo.targetSdkVersion > Build.VERSION_CODES.N_MR1; + return packageInfo.applicationInfo.targetSdkVersion >= Build.VERSION_CODES.O; } public UserInfo getUserInfo() { diff --git a/core/java/android/widget/DayPickerView.java b/core/java/android/widget/DayPickerView.java index be0967f162c4..cfd1445ea3f8 100644 --- a/core/java/android/widget/DayPickerView.java +++ b/core/java/android/widget/DayPickerView.java @@ -16,7 +16,7 @@ package android.widget; -import static android.os.Build.VERSION_CODES.N_MR1; +import static android.os.Build.VERSION_CODES.O; import android.annotation.Nullable; import android.content.Context; @@ -302,7 +302,7 @@ class DayPickerView extends ViewGroup { getTempCalendarForTime(timeInMillis); final int targetSdkVersion = mContext.getApplicationInfo().targetSdkVersion; - if (targetSdkVersion > N_MR1) { + if (targetSdkVersion >= O) { if (mTempCalendar.before(mMinDate) || mTempCalendar.after(mMaxDate)) { throw new IllegalArgumentException("timeInMillis must be between the values of " + "getMinDate() and getMaxDate()"); diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 6be79004d8f9..c8eb98c90da2 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -1521,7 +1521,7 @@ public class WindowManagerService extends IWindowManager.Stub // Try using the target SDK of the root window if (attachedWindow != null) { return attachedWindow.mAppToken != null - && attachedWindow.mAppToken.mTargetSdk > Build.VERSION_CODES.N_MR1; + && attachedWindow.mAppToken.mTargetSdk >= Build.VERSION_CODES.O; } else { // Otherwise, look at the package try { @@ -1532,7 +1532,7 @@ public class WindowManagerService extends IWindowManager.Stub throw new SecurityException("Package " + packageName + " not in UID " + callingUid); } - if (appInfo.targetSdkVersion > Build.VERSION_CODES.N_MR1) { + if (appInfo.targetSdkVersion >= Build.VERSION_CODES.O) { return true; } } catch (PackageManager.NameNotFoundException e) { |