diff options
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/ActivityManager.java | 4 | ||||
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 3 | ||||
| -rw-r--r-- | core/java/android/app/Fragment.java | 2 | ||||
| -rw-r--r-- | core/java/android/app/Notification.java | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 84a7f5d..2cd7379 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -930,7 +930,7 @@ public class ActivityManager { * same time, assumptions made about the meaning of the data here for * purposes of control flow will be incorrect.</p> * - * @deprecated As of {@link android.os.Build.VERSION_CODES#L}, this method is + * @deprecated As of {@link android.os.Build.VERSION_CODES#LOLLIPOP}, this method is * no longer available to third party applications: the introduction of * document-centric recents means * it can leak personal information to the caller. For backwards compatibility, @@ -1216,7 +1216,7 @@ public class ActivityManager { * same time, assumptions made about the meaning of the data here for * purposes of control flow will be incorrect.</p> * - * @deprecated As of {@link android.os.Build.VERSION_CODES#L}, this method + * @deprecated As of {@link android.os.Build.VERSION_CODES#LOLLIPOP}, this method * is no longer available to third party * applications: the introduction of document-centric recents means * it can leak person information to the caller. For backwards compatibility, diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index e9340eb..7fafc38 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -148,7 +148,6 @@ import android.app.trust.TrustManager; import com.android.internal.annotations.GuardedBy; import com.android.internal.app.IAppOpsService; import com.android.internal.os.IDropBoxManagerService; -import com.android.internal.telecom.ITelecomService; import java.io.File; import java.io.FileInputStream; @@ -1671,7 +1670,7 @@ class ContextImpl extends Context { private void validateServiceIntent(Intent service) { if (service.getComponent() == null && service.getPackage() == null) { - if (getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.L) { + if (getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.LOLLIPOP) { IllegalArgumentException ex = new IllegalArgumentException( "Service Intent must be explicit: " + service); throw ex; diff --git a/core/java/android/app/Fragment.java b/core/java/android/app/Fragment.java index 5196834..af45731 100644 --- a/core/java/android/app/Fragment.java +++ b/core/java/android/app/Fragment.java @@ -1125,7 +1125,7 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene */ public LayoutInflater getLayoutInflater(Bundle savedInstanceState) { // Newer platform versions use the child fragment manager's LayoutInflaterFactory. - if (mActivity.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.L) { + if (mActivity.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.LOLLIPOP) { LayoutInflater result = mActivity.getLayoutInflater().cloneInContext(mActivity); getChildFragmentManager(); // Init if needed; use raw implementation below. result.setPrivateFactory(mChildFragmentManager.getLayoutInflaterFactory()); diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 4b3aefe..fb10e17 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -1948,7 +1948,7 @@ public class Notification implements Parcelable mPriority = PRIORITY_DEFAULT; mPeople = new ArrayList<String>(); - mColorUtil = context.getApplicationInfo().targetSdkVersion < Build.VERSION_CODES.L ? + mColorUtil = context.getApplicationInfo().targetSdkVersion < Build.VERSION_CODES.LOLLIPOP ? NotificationColorUtil.getInstance(mContext) : null; } |