Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 529b7894 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 

* commit '89b19695':
  Put in real "code" (aka marketing) name.
parents 511925c9 89b19695

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -21400,6 +21400,7 @@ package android.os { 
    field public static final int KITKAT = 19; // 0x13

    field public static final int KITKAT_WATCH = 20; // 0x14

    field public static final int L = 21; // 0x15

    field public static final int LOLLIPOP = 21; // 0x15

  }















  public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

























core/java/android/app/ActivityManager.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -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,

































core/java/android/app/ContextImpl.java



+1
−2




























Original line number
Diff line number
Diff line








@@ -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;

































core/java/android/app/Fragment.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -1124,7 +1124,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());

































core/java/android/app/Notification.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -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;















        }