Merge "More API changes." into mnc-dev (b0a5e78f) · Commits · e / os / android_frameworks_base

Android.mk

+2 −2

Original line number	Diff line number	Diff line
		@@ -555,8 +555,6 @@ aidl_files := \
		frameworks/base/core/java/android/service/chooser/ChooserTarget.aidl \
		frameworks/base/core/java/android/speech/tts/Voice.aidl \
		frameworks/base/core/java/android/app/usage/UsageEvents.aidl \
		frameworks/base/core/java/android/app/AssistStructure.aidl \
		frameworks/base/core/java/android/app/AssistContent.aidl \
		frameworks/base/core/java/android/app/Notification.aidl \
		frameworks/base/core/java/android/app/NotificationManager.aidl \
		frameworks/base/core/java/android/app/WallpaperInfo.aidl \
		@@ -566,6 +564,8 @@ aidl_files := \
		frameworks/base/core/java/android/app/AlarmManager.aidl \
		frameworks/base/core/java/android/app/SearchableInfo.aidl \
		frameworks/base/core/java/android/app/VoiceInteractor.aidl \
		frameworks/base/core/java/android/app/assist/AssistContent.aidl \
		frameworks/base/core/java/android/app/assist/AssistStructure.aidl \
		frameworks/base/core/java/android/app/job/JobParameters.aidl \
		frameworks/base/core/java/android/app/job/JobInfo.aidl \
		frameworks/base/core/java/android/appwidget/AppWidgetProviderInfo.aidl \

api/current.txt

+25 −12

Original line number	Diff line number	Diff line
		@@ -3445,7 +3445,7 @@ package android.app {
		method public void onPrepareNavigateUpTaskStack(android.app.TaskStackBuilder);
		method public boolean onPrepareOptionsMenu(android.view.Menu);
		method public boolean onPreparePanel(int, android.view.View, android.view.Menu);
		method public void onProvideAssistContent(android.app.AssistContent);
		method public void onProvideAssistContent(android.app.assist.AssistContent);
		method public void onProvideAssistData(android.os.Bundle);
		method public void onRequestPermissionsResult(int, java.lang.String[], int[]);
		method protected void onRestart();
		@@ -3996,26 +3996,19 @@ package android.app {
		field public java.lang.String serviceDetails;
		}

		public class AssistContent implements android.os.Parcelable {
		public deprecated class AssistContent {
		ctor public AssistContent();
		method public int describeContents();
		method public android.content.ClipData getClipData();
		method public android.content.Intent getIntent();
		method public android.net.Uri getWebUri();
		method public void setClipData(android.content.ClipData);
		method public void setIntent(android.content.Intent);
		method public void setWebUri(android.net.Uri);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.AssistContent> CREATOR;
		}

		public final class AssistStructure implements android.os.Parcelable {
		method public int describeContents();
		public deprecated class AssistStructure {
		ctor public AssistStructure();
		method public android.content.ComponentName getActivityComponent();
		method public android.app.AssistStructure.WindowNode getWindowNodeAt(int);
		method public int getWindowNodeCount();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.AssistStructure> CREATOR;
		}

		public static class AssistStructure.ViewNode {
		@@ -5900,6 +5893,26 @@ package android.app.admin {

		}

		package android.app.assist {

		public final class AssistContent extends android.app.AssistContent implements android.os.Parcelable {
		ctor public AssistContent(android.os.Parcel);
		method public int describeContents();
		method public android.content.Intent getIntent();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.assist.AssistContent> CREATOR;
		}

		public final class AssistStructure extends android.app.AssistStructure implements android.os.Parcelable {
		ctor public AssistStructure();
		method public int describeContents();
		method public android.app.AssistStructure.WindowNode getWindowNodeAt(int);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.assist.AssistStructure> CREATOR;
		}

		}

		package android.app.backup {

		public abstract class BackupAgent extends android.content.ContextWrapper {
		@@ -28935,7 +28948,7 @@ package android.service.voice {
		method public android.view.View onCreateContentView();
		method public void onDestroy();
		method public boolean[] onGetSupportedCommands(java.lang.String[]);
		method public void onHandleAssist(android.os.Bundle, android.app.AssistStructure, android.app.AssistContent);
		method public void onHandleAssist(android.os.Bundle, android.app.assist.AssistStructure, android.app.assist.AssistContent);
		method public void onHide();
		method public boolean onKeyDown(int, android.view.KeyEvent);
		method public boolean onKeyLongPress(int, android.view.KeyEvent);

api/system-current.txt

+25 −12

Original line number	Diff line number	Diff line
		@@ -3531,7 +3531,7 @@ package android.app {
		method public void onPrepareNavigateUpTaskStack(android.app.TaskStackBuilder);
		method public boolean onPrepareOptionsMenu(android.view.Menu);
		method public boolean onPreparePanel(int, android.view.View, android.view.Menu);
		method public void onProvideAssistContent(android.app.AssistContent);
		method public void onProvideAssistContent(android.app.assist.AssistContent);
		method public void onProvideAssistData(android.os.Bundle);
		method public void onRequestPermissionsResult(int, java.lang.String[], int[]);
		method protected void onRestart();
		@@ -4092,26 +4092,19 @@ package android.app {
		field public java.lang.String serviceDetails;
		}

		public class AssistContent implements android.os.Parcelable {
		public deprecated class AssistContent {
		ctor public AssistContent();
		method public int describeContents();
		method public android.content.ClipData getClipData();
		method public android.content.Intent getIntent();
		method public android.net.Uri getWebUri();
		method public void setClipData(android.content.ClipData);
		method public void setIntent(android.content.Intent);
		method public void setWebUri(android.net.Uri);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.AssistContent> CREATOR;
		}

		public final class AssistStructure implements android.os.Parcelable {
		method public int describeContents();
		public deprecated class AssistStructure {
		ctor public AssistStructure();
		method public android.content.ComponentName getActivityComponent();
		method public android.app.AssistStructure.WindowNode getWindowNodeAt(int);
		method public int getWindowNodeCount();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.AssistStructure> CREATOR;
		}

		public static class AssistStructure.ViewNode {
		@@ -6015,6 +6008,26 @@ package android.app.admin {

		}

		package android.app.assist {

		public final class AssistContent extends android.app.AssistContent implements android.os.Parcelable {
		ctor public AssistContent(android.os.Parcel);
		method public int describeContents();
		method public android.content.Intent getIntent();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.assist.AssistContent> CREATOR;
		}

		public final class AssistStructure extends android.app.AssistStructure implements android.os.Parcelable {
		ctor public AssistStructure();
		method public int describeContents();
		method public android.app.AssistStructure.WindowNode getWindowNodeAt(int);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.assist.AssistStructure> CREATOR;
		}

		}

		package android.app.backup {

		public abstract class BackupAgent extends android.content.ContextWrapper {
		@@ -31068,7 +31081,7 @@ package android.service.voice {
		method public android.view.View onCreateContentView();
		method public void onDestroy();
		method public boolean[] onGetSupportedCommands(java.lang.String[]);
		method public void onHandleAssist(android.os.Bundle, android.app.AssistStructure, android.app.AssistContent);
		method public void onHandleAssist(android.os.Bundle, android.app.assist.AssistStructure, android.app.assist.AssistContent);
		method public void onHide();
		method public boolean onKeyDown(int, android.view.KeyEvent);
		method public boolean onKeyLongPress(int, android.view.KeyEvent);

core/java/android/app/Activity.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ import com.android.internal.app.ToolbarActionBar;

		import android.annotation.SystemApi;
		import android.app.admin.DevicePolicyManager;
		import android.app.assist.AssistContent;
		import android.content.ComponentCallbacks2;
		import android.content.ComponentName;
		import android.content.ContentResolver;

core/java/android/app/ActivityManagerNative.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,8 @@
		package android.app;

		import android.app.ActivityManager.StackInfo;
		import android.app.assist.AssistContent;
		import android.app.assist.AssistStructure;
		import android.content.ComponentName;
		import android.content.IIntentReceiver;
		import android.content.IIntentSender;