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

Commit 04d53e26 authored by Bill Yi's avatar Bill Yi Committed by Gerrit Code Review
Browse files

Merge "Merge pi-dr1-dev to aosp-master"

parents 7fff7e5e 0b537c73

core/java/android/animation/IntEvaluator.java

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ public class IntEvaluator implements TypeEvaluator<Integer> { 
    /**

     * This function returns the result of linearly interpolating the start and end values, with

     * <code>fraction</code> representing the proportion between the start and end values. The

     * calculation is a simple parametric calculation: <code>result = x0 + t * (v1 - v0)</code>,

     * calculation is a simple parametric calculation: <code>result = x0 + t * (x1 - x0)</code>,

     * where <code>x0</code> is <code>startValue</code>, <code>x1</code> is <code>endValue</code>,

     * and <code>t</code> is <code>fraction</code>.

     *

core/java/android/app/ActivityManagerInternal.java

+6 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.annotation.Nullable; 
import android.content.ComponentName;

import android.content.IIntentSender;

import android.content.Intent;

import android.content.pm.ApplicationInfo;

import android.content.res.Configuration;

import android.os.Bundle;

import android.os.IBinder;
@@ -407,4 +408,9 @@ public abstract class ActivityManagerInternal { 
     * has {@code permission}.

     */

    public abstract void enforceCallerIsRecentsOrHasPermission(String permission, String func);



    /**

     * @return The intent used to launch the home activity.

     */

    public abstract Intent getHomeIntent();

}

core/java/android/app/Notification.java

+0 −1
Original line number Diff line number Diff line
@@ -2775,7 +2775,6 @@ public class Notification implements Parcelable 
     */

    private void fixDuplicateExtras() {

        if (extras != null) {

            fixDuplicateExtra(mSmallIcon, EXTRA_SMALL_ICON);

            fixDuplicateExtra(mLargeIcon, EXTRA_LARGE_ICON);

        }

    }

core/java/android/app/admin/DevicePolicyManager.java

+2 −2
Original line number Diff line number Diff line
@@ -9429,9 +9429,9 @@ public class DevicePolicyManager { 
     * <ul>

     *   <li>{@link ApnSetting#getOperatorNumeric()}</li>

     *   <li>{@link ApnSetting#getApnName()}</li>

     *   <li>{@link ApnSetting#getProxyAddress()}</li>

     *   <li>{@link ApnSetting#getProxyAddressAsString()}</li>

     *   <li>{@link ApnSetting#getProxyPort()}</li>

     *   <li>{@link ApnSetting#getMmsProxyAddress()}</li>

     *   <li>{@link ApnSetting#getMmsProxyAddressAsString()}</li>

     *   <li>{@link ApnSetting#getMmsProxyPort()}</li>

     *   <li>{@link ApnSetting#getMmsc()}</li>

     *   <li>{@link ApnSetting#isEnabled()}</li>

core/java/android/content/pm/ApplicationInfo.java

+6 −0
Original line number Diff line number Diff line
@@ -1141,6 +1141,9 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
    /** @hide */

    public String[] splitClassLoaderNames;



    /** @hide */

    public boolean hiddenUntilInstalled;



    /**

     * Represents the default policy. The actual policy used will depend on other properties of

     * the application, e.g. the target SDK version.
@@ -1485,6 +1488,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
        compileSdkVersion = orig.compileSdkVersion;

        compileSdkVersionCodename = orig.compileSdkVersionCodename;

        mHiddenApiPolicy = orig.mHiddenApiPolicy;

        hiddenUntilInstalled = orig.hiddenUntilInstalled;

    }



    public String toString() {
@@ -1559,6 +1563,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
        dest.writeString(compileSdkVersionCodename);

        dest.writeString(appComponentFactory);

        dest.writeInt(mHiddenApiPolicy);

        dest.writeInt(hiddenUntilInstalled ? 1 : 0);

    }



    public static final Parcelable.Creator<ApplicationInfo> CREATOR
@@ -1630,6 +1635,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
        compileSdkVersionCodename = source.readString();

        appComponentFactory = source.readString();

        mHiddenApiPolicy = source.readInt();

        hiddenUntilInstalled = source.readInt() != 0;

    }



    /**