Merge stage-dr1-aosp-master into stage-aosp-master (941185b8) · Commits · e / os / android_frameworks_base

Android.bp

+0 −5

Original line number	Diff line number	Diff line
		@@ -1536,11 +1536,6 @@ metalava_framework_docs_args = "--manifest $(location core/res/AndroidManifest.x
		doc_defaults {
		name: "metalava-api-stubs-default",
		srcs: [
		// test mock src files.
		"test-mock/src/android/test/mock/*/.java",
		// test runner excluding mock src files.
		"test-runner/src/*/.java",
		"test-base/src/*/.java",
		":opt-telephony-srcs",
		":opt-net-voip-srcs",
		":openjdk_javadoc_files",

config/hiddenapi-light-greylist.txt

+3 −0

Original line number	Diff line number	Diff line
		@@ -1574,6 +1574,7 @@ Landroid/content/pm/UserInfo;->serialNumber:I
		Landroid/content/pm/VerifierInfo;-><init>(Ljava/lang/String;Ljava/security/PublicKey;)V
		Landroid/content/pm/XmlSerializerAndParser;->createFromXml(Lorg/xmlpull/v1/XmlPullParser;)Ljava/lang/Object;
		Landroid/content/pm/XmlSerializerAndParser;->writeAsXml(Ljava/lang/Object;Lorg/xmlpull/v1/XmlSerializer;)V
		Landroid/content/res/ApkAssets;->getAssetPath()Ljava/lang/String;
		Landroid/content/res/AssetFileDescriptor;->mFd:Landroid/os/ParcelFileDescriptor;
		Landroid/content/res/AssetFileDescriptor;->mLength:J
		Landroid/content/res/AssetFileDescriptor;->mStartOffset:J
		@@ -1585,6 +1586,7 @@ Landroid/content/res/AssetManager;->addAssetPathAsSharedLibrary(Ljava/lang/Strin
		Landroid/content/res/AssetManager;->addOverlayPath(Ljava/lang/String;)I
		Landroid/content/res/AssetManager;->applyStyle(JIILandroid/content/res/XmlBlock$Parser;[IJJ)V
		Landroid/content/res/AssetManager;->createTheme()J
		Landroid/content/res/AssetManager;->getApkAssets()[Landroid/content/res/ApkAssets;
		Landroid/content/res/AssetManager;->getAssignedPackageIdentifiers()Landroid/util/SparseArray;
		Landroid/content/res/AssetManager;->getGlobalAssetCount()I
		Landroid/content/res/AssetManager;->getGlobalAssetManagerCount()I
		@@ -5146,6 +5148,7 @@ Landroid/view/SurfaceControl;->getDisplayConfigs(Landroid/os/IBinder;)[Landroid/
		Landroid/view/SurfaceControl;->HIDDEN:I
		Landroid/view/SurfaceControl;->hide()V
		Landroid/view/SurfaceControl;->openTransaction()V
		Landroid/view/SurfaceControl;->screenshot(Landroid/graphics/Rect;III)Landroid/graphics/Bitmap;
		Landroid/view/SurfaceControl;->screenshot(Landroid/graphics/Rect;IIIIZI)Landroid/graphics/Bitmap;
		Landroid/view/SurfaceControl;->screenshot(Landroid/os/IBinder;Landroid/view/Surface;Landroid/graphics/Rect;IIIIZZ)V
		Landroid/view/SurfaceControl;->setDisplayLayerStack(Landroid/os/IBinder;I)V

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
		@@ -2767,7 +2767,6 @@ public class Notification implements Parcelable
		*/
		private void fixDuplicateExtras() {
		if (extras != null) {
		fixDuplicateExtra(mSmallIcon, EXTRA_SMALL_ICON);
		fixDuplicateExtra(mLargeIcon, EXTRA_LARGE_ICON);
		}
		}