Merge "Implement system API for monitoring uid importance changes." (cdb31d2e) · Commits · e / os / android_frameworks_base

api/current.txt

+18 −18

Original line number	Diff line number	Diff line
		@@ -11800,14 +11800,14 @@ package android.graphics {
		method public deprecated boolean clipRegion(android.graphics.Region);
		method public void concat(android.graphics.Matrix);
		method public void drawARGB(int, int, int, int);
		method public void drawArc(float, float, float, float, float, float, boolean, android.graphics.Paint);
		method public void drawArc(android.graphics.RectF, float, float, boolean, android.graphics.Paint);
		method public void drawArc(float, float, float, float, float, float, boolean, android.graphics.Paint);
		method public void drawBitmap(android.graphics.Bitmap, float, float, android.graphics.Paint);
		method public void drawBitmap(android.graphics.Bitmap, android.graphics.Matrix, android.graphics.Paint);
		method public void drawBitmap(android.graphics.Bitmap, android.graphics.Rect, android.graphics.Rect, android.graphics.Paint);
		method public void drawBitmap(android.graphics.Bitmap, android.graphics.Rect, android.graphics.RectF, android.graphics.Paint);
		method public void drawBitmap(android.graphics.Bitmap, android.graphics.Rect, android.graphics.Rect, android.graphics.Paint);
		method public deprecated void drawBitmap(int[], int, int, float, float, int, int, boolean, android.graphics.Paint);
		method public deprecated void drawBitmap(int[], int, int, int, int, int, int, boolean, android.graphics.Paint);
		method public void drawBitmap(android.graphics.Bitmap, android.graphics.Matrix, android.graphics.Paint);
		method public void drawBitmapMesh(android.graphics.Bitmap, int, int, float[], int, int[], int, android.graphics.Paint);
		method public void drawCircle(float, float, float, android.graphics.Paint);
		method public void drawColor(int);
		@@ -11815,28 +11815,28 @@ package android.graphics {
		method public void drawLine(float, float, float, float, android.graphics.Paint);
		method public void drawLines(float[], int, int, android.graphics.Paint);
		method public void drawLines(float[], android.graphics.Paint);
		method public void drawOval(float, float, float, float, android.graphics.Paint);
		method public void drawOval(android.graphics.RectF, android.graphics.Paint);
		method public void drawOval(float, float, float, float, android.graphics.Paint);
		method public void drawPaint(android.graphics.Paint);
		method public void drawPath(android.graphics.Path, android.graphics.Paint);
		method public void drawPicture(android.graphics.Picture);
		method public void drawPicture(android.graphics.Picture, android.graphics.Rect);
		method public void drawPicture(android.graphics.Picture, android.graphics.RectF);
		method public void drawPicture(android.graphics.Picture, android.graphics.Rect);
		method public void drawPoint(float, float, android.graphics.Paint);
		method public void drawPoints(float[], int, int, android.graphics.Paint);
		method public void drawPoints(float[], android.graphics.Paint);
		method public deprecated void drawPosText(char[], int, int, float[], android.graphics.Paint);
		method public deprecated void drawPosText(java.lang.String, float[], android.graphics.Paint);
		method public void drawRGB(int, int, int);
		method public void drawRect(float, float, float, float, android.graphics.Paint);
		method public void drawRect(android.graphics.Rect, android.graphics.Paint);
		method public void drawRect(android.graphics.RectF, android.graphics.Paint);
		method public void drawRoundRect(float, float, float, float, float, float, android.graphics.Paint);
		method public void drawRect(android.graphics.Rect, android.graphics.Paint);
		method public void drawRect(float, float, float, float, android.graphics.Paint);
		method public void drawRoundRect(android.graphics.RectF, float, float, android.graphics.Paint);
		method public void drawRoundRect(float, float, float, float, float, float, android.graphics.Paint);
		method public void drawText(char[], int, int, float, float, android.graphics.Paint);
		method public void drawText(java.lang.CharSequence, int, int, float, float, android.graphics.Paint);
		method public void drawText(java.lang.String, float, float, android.graphics.Paint);
		method public void drawText(java.lang.String, int, int, float, float, android.graphics.Paint);
		method public void drawText(java.lang.CharSequence, int, int, float, float, android.graphics.Paint);
		method public void drawTextOnPath(char[], int, int, android.graphics.Path, float, float, android.graphics.Paint);
		method public void drawTextOnPath(java.lang.String, android.graphics.Path, float, float, android.graphics.Paint);
		method public void drawTextRun(char[], int, int, int, int, float, float, boolean, android.graphics.Paint);
		@@ -32103,6 +32103,15 @@ package android.provider {
		field public static final java.lang.String MIME_TYPE_DIR = "vnd.android.document/directory";
		}

		public static final class DocumentsContract.Path implements android.os.Parcelable {
		ctor public DocumentsContract.Path(java.lang.String, java.util.List<java.lang.String>);
		method public int describeContents();
		method public java.util.List<java.lang.String> getPath();
		method public java.lang.String getRootId();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.provider.DocumentsContract.Path> CREATOR;
		}

		public static final class DocumentsContract.Root {
		field public static final java.lang.String COLUMN_AVAILABLE_BYTES = "available_bytes";
		field public static final java.lang.String COLUMN_CAPACITY_BYTES = "capacity_bytes";
		@@ -32120,15 +32129,6 @@ package android.provider {
		field public static final int FLAG_SUPPORTS_SEARCH = 8; // 0x8
		}

		public static final class DocumentsContract.Path implements android.os.Parcelable {
		ctor public DocumentsContract.Path(java.lang.String, java.util.List<java.lang.String>);
		method public int describeContents();
		method public java.util.List<java.lang.String> getPath();
		method public java.lang.String getRootId();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.provider.DocumentsContract.Path> CREATOR;
		}

		public abstract class DocumentsProvider extends android.content.ContentProvider {
		ctor public DocumentsProvider();
		method public java.lang.String copyDocument(java.lang.String, java.lang.String) throws java.io.FileNotFoundException;

api/system-current.txt

+15 −9

Original line number	Diff line number	Diff line
		@@ -3819,6 +3819,7 @@ package android.app {

		public class ActivityManager {
		method public int addAppTask(android.app.Activity, android.content.Intent, android.app.ActivityManager.TaskDescription, android.graphics.Bitmap);
		method public void addOnUidImportanceListener(android.app.ActivityManager.OnUidImportanceListener, int);
		method public boolean clearApplicationUserData();
		method public void clearWatchHeapLimit();
		method public void dumpPackageState(java.io.FileDescriptor, java.lang.String);
		@@ -3849,6 +3850,7 @@ package android.app {
		method public void killUid(int, java.lang.String);
		method public void moveTaskToFront(int, int);
		method public void moveTaskToFront(int, int, android.os.Bundle);
		method public void removeOnUidImportanceListener(android.app.ActivityManager.OnUidImportanceListener);
		method public deprecated void restartPackage(java.lang.String);
		method public static void setVrThread(int);
		method public void setWatchHeapLimit(long);
		@@ -3883,6 +3885,10 @@ package android.app {
		field public long totalMem;
		}

		public static abstract interface ActivityManager.OnUidImportanceListener {
		method public abstract void onUidImportance(int, int);
		}

		public static class ActivityManager.ProcessErrorStateInfo implements android.os.Parcelable {
		ctor public ActivityManager.ProcessErrorStateInfo();
		method public int describeContents();
		@@ -12251,14 +12257,14 @@ package android.graphics {
		method public deprecated boolean clipRegion(android.graphics.Region);
		method public void concat(android.graphics.Matrix);
		method public void drawARGB(int, int, int, int);
		method public void drawArc(float, float, float, float, float, float, boolean, android.graphics.Paint);
		method public void drawArc(android.graphics.RectF, float, float, boolean, android.graphics.Paint);
		method public void drawArc(float, float, float, float, float, float, boolean, android.graphics.Paint);
		method public void drawBitmap(android.graphics.Bitmap, float, float, android.graphics.Paint);
		method public void drawBitmap(android.graphics.Bitmap, android.graphics.Matrix, android.graphics.Paint);
		method public void drawBitmap(android.graphics.Bitmap, android.graphics.Rect, android.graphics.Rect, android.graphics.Paint);
		method public void drawBitmap(android.graphics.Bitmap, android.graphics.Rect, android.graphics.RectF, android.graphics.Paint);
		method public void drawBitmap(android.graphics.Bitmap, android.graphics.Rect, android.graphics.Rect, android.graphics.Paint);
		method public deprecated void drawBitmap(int[], int, int, float, float, int, int, boolean, android.graphics.Paint);
		method public deprecated void drawBitmap(int[], int, int, int, int, int, int, boolean, android.graphics.Paint);
		method public void drawBitmap(android.graphics.Bitmap, android.graphics.Matrix, android.graphics.Paint);
		method public void drawBitmapMesh(android.graphics.Bitmap, int, int, float[], int, int[], int, android.graphics.Paint);
		method public void drawCircle(float, float, float, android.graphics.Paint);
		method public void drawColor(int);
		@@ -12266,28 +12272,28 @@ package android.graphics {
		method public void drawLine(float, float, float, float, android.graphics.Paint);
		method public void drawLines(float[], int, int, android.graphics.Paint);
		method public void drawLines(float[], android.graphics.Paint);
		method public void drawOval(float, float, float, float, android.graphics.Paint);
		method public void drawOval(android.graphics.RectF, android.graphics.Paint);
		method public void drawOval(float, float, float, float, android.graphics.Paint);
		method public void drawPaint(android.graphics.Paint);
		method public void drawPath(android.graphics.Path, android.graphics.Paint);
		method public void drawPicture(android.graphics.Picture);
		method public void drawPicture(android.graphics.Picture, android.graphics.Rect);
		method public void drawPicture(android.graphics.Picture, android.graphics.RectF);
		method public void drawPicture(android.graphics.Picture, android.graphics.Rect);
		method public void drawPoint(float, float, android.graphics.Paint);
		method public void drawPoints(float[], int, int, android.graphics.Paint);
		method public void drawPoints(float[], android.graphics.Paint);
		method public deprecated void drawPosText(char[], int, int, float[], android.graphics.Paint);
		method public deprecated void drawPosText(java.lang.String, float[], android.graphics.Paint);
		method public void drawRGB(int, int, int);
		method public void drawRect(float, float, float, float, android.graphics.Paint);
		method public void drawRect(android.graphics.Rect, android.graphics.Paint);
		method public void drawRect(android.graphics.RectF, android.graphics.Paint);
		method public void drawRoundRect(float, float, float, float, float, float, android.graphics.Paint);
		method public void drawRect(android.graphics.Rect, android.graphics.Paint);
		method public void drawRect(float, float, float, float, android.graphics.Paint);
		method public void drawRoundRect(android.graphics.RectF, float, float, android.graphics.Paint);
		method public void drawRoundRect(float, float, float, float, float, float, android.graphics.Paint);
		method public void drawText(char[], int, int, float, float, android.graphics.Paint);
		method public void drawText(java.lang.CharSequence, int, int, float, float, android.graphics.Paint);
		method public void drawText(java.lang.String, float, float, android.graphics.Paint);
		method public void drawText(java.lang.String, int, int, float, float, android.graphics.Paint);
		method public void drawText(java.lang.CharSequence, int, int, float, float, android.graphics.Paint);
		method public void drawTextOnPath(char[], int, int, android.graphics.Path, float, float, android.graphics.Paint);
		method public void drawTextOnPath(java.lang.String, android.graphics.Path, float, float, android.graphics.Paint);
		method public void drawTextRun(char[], int, int, int, int, float, float, boolean, android.graphics.Paint);

api/test-current.txt

+16 −9

Original line number	Diff line number	Diff line
		@@ -3699,6 +3699,7 @@ package android.app {

		public class ActivityManager {
		method public int addAppTask(android.app.Activity, android.content.Intent, android.app.ActivityManager.TaskDescription, android.graphics.Bitmap);
		method public void addOnUidImportanceListener(android.app.ActivityManager.OnUidImportanceListener, int);
		method public boolean clearApplicationUserData();
		method public void clearWatchHeapLimit();
		method public void dumpPackageState(java.io.FileDescriptor, java.lang.String);
		@@ -3712,6 +3713,7 @@ package android.app {
		method public int getMemoryClass();
		method public void getMemoryInfo(android.app.ActivityManager.MemoryInfo);
		method public static void getMyMemoryState(android.app.ActivityManager.RunningAppProcessInfo);
		method public int getPackageImportance(java.lang.String);
		method public android.os.Debug.MemoryInfo[] getProcessMemoryInfo(int[]);
		method public java.util.List<android.app.ActivityManager.ProcessErrorStateInfo> getProcessesInErrorState();
		method public deprecated java.util.List<android.app.ActivityManager.RecentTaskInfo> getRecentTasks(int, int) throws java.lang.SecurityException;
		@@ -3726,6 +3728,7 @@ package android.app {
		method public void killBackgroundProcesses(java.lang.String);
		method public void moveTaskToFront(int, int);
		method public void moveTaskToFront(int, int, android.os.Bundle);
		method public void removeOnUidImportanceListener(android.app.ActivityManager.OnUidImportanceListener);
		method public deprecated void restartPackage(java.lang.String);
		method public static void setVrThread(int);
		method public void setWatchHeapLimit(long);
		@@ -3760,6 +3763,10 @@ package android.app {
		field public long totalMem;
		}

		public static abstract interface ActivityManager.OnUidImportanceListener {
		method public abstract void onUidImportance(int, int);
		}

		public static class ActivityManager.ProcessErrorStateInfo implements android.os.Parcelable {
		ctor public ActivityManager.ProcessErrorStateInfo();
		method public int describeContents();
		@@ -11818,14 +11825,14 @@ package android.graphics {
		method public deprecated boolean clipRegion(android.graphics.Region);
		method public void concat(android.graphics.Matrix);
		method public void drawARGB(int, int, int, int);
		method public void drawArc(float, float, float, float, float, float, boolean, android.graphics.Paint);
		method public void drawArc(android.graphics.RectF, float, float, boolean, android.graphics.Paint);
		method public void drawArc(float, float, float, float, float, float, boolean, android.graphics.Paint);
		method public void drawBitmap(android.graphics.Bitmap, float, float, android.graphics.Paint);
		method public void drawBitmap(android.graphics.Bitmap, android.graphics.Matrix, android.graphics.Paint);
		method public void drawBitmap(android.graphics.Bitmap, android.graphics.Rect, android.graphics.Rect, android.graphics.Paint);
		method public void drawBitmap(android.graphics.Bitmap, android.graphics.Rect, android.graphics.RectF, android.graphics.Paint);
		method public void drawBitmap(android.graphics.Bitmap, android.graphics.Rect, android.graphics.Rect, android.graphics.Paint);
		method public deprecated void drawBitmap(int[], int, int, float, float, int, int, boolean, android.graphics.Paint);
		method public deprecated void drawBitmap(int[], int, int, int, int, int, int, boolean, android.graphics.Paint);
		method public void drawBitmap(android.graphics.Bitmap, android.graphics.Matrix, android.graphics.Paint);
		method public void drawBitmapMesh(android.graphics.Bitmap, int, int, float[], int, int[], int, android.graphics.Paint);
		method public void drawCircle(float, float, float, android.graphics.Paint);
		method public void drawColor(int);
		@@ -11833,28 +11840,28 @@ package android.graphics {
		method public void drawLine(float, float, float, float, android.graphics.Paint);
		method public void drawLines(float[], int, int, android.graphics.Paint);
		method public void drawLines(float[], android.graphics.Paint);
		method public void drawOval(float, float, float, float, android.graphics.Paint);
		method public void drawOval(android.graphics.RectF, android.graphics.Paint);
		method public void drawOval(float, float, float, float, android.graphics.Paint);
		method public void drawPaint(android.graphics.Paint);
		method public void drawPath(android.graphics.Path, android.graphics.Paint);
		method public void drawPicture(android.graphics.Picture);
		method public void drawPicture(android.graphics.Picture, android.graphics.Rect);
		method public void drawPicture(android.graphics.Picture, android.graphics.RectF);
		method public void drawPicture(android.graphics.Picture, android.graphics.Rect);
		method public void drawPoint(float, float, android.graphics.Paint);
		method public void drawPoints(float[], int, int, android.graphics.Paint);
		method public void drawPoints(float[], android.graphics.Paint);
		method public deprecated void drawPosText(char[], int, int, float[], android.graphics.Paint);
		method public deprecated void drawPosText(java.lang.String, float[], android.graphics.Paint);
		method public void drawRGB(int, int, int);
		method public void drawRect(float, float, float, float, android.graphics.Paint);
		method public void drawRect(android.graphics.Rect, android.graphics.Paint);
		method public void drawRect(android.graphics.RectF, android.graphics.Paint);
		method public void drawRoundRect(float, float, float, float, float, float, android.graphics.Paint);
		method public void drawRect(android.graphics.Rect, android.graphics.Paint);
		method public void drawRect(float, float, float, float, android.graphics.Paint);
		method public void drawRoundRect(android.graphics.RectF, float, float, android.graphics.Paint);
		method public void drawRoundRect(float, float, float, float, float, float, android.graphics.Paint);
		method public void drawText(char[], int, int, float, float, android.graphics.Paint);
		method public void drawText(java.lang.CharSequence, int, int, float, float, android.graphics.Paint);
		method public void drawText(java.lang.String, float, float, android.graphics.Paint);
		method public void drawText(java.lang.String, int, int, float, float, android.graphics.Paint);
		method public void drawText(java.lang.CharSequence, int, int, float, float, android.graphics.Paint);
		method public void drawTextOnPath(char[], int, int, android.graphics.Path, float, float, android.graphics.Paint);
		method public void drawTextOnPath(java.lang.String, android.graphics.Path, float, float, android.graphics.Paint);
		method public void drawTextRun(char[], int, int, int, int, float, float, boolean, android.graphics.Paint);

core/java/android/app/ActivityManager.java

+124 −2

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/app/IActivityManager.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -431,7 +431,7 @@ interface IActivityManager {
		* etc.
		*/
		void keyguardGoingAway(int flags) = 296;
		void registerUidObserver(in IUidObserver observer, int which) = 297;
		void registerUidObserver(in IUidObserver observer, int which, String callingPackage) = 297;
		void unregisterUidObserver(in IUidObserver observer) = 298;
		boolean isAssistDataAllowedOnCurrentActivity() = 299;
		boolean showAssistFromActivity(in IBinder token, in Bundle args) = 300;