Merge "Move EphemeralResolverService" into nyc-mr1-dev (9d9621f4) · Commits · e / os / android_frameworks_base

Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -75,6 +75,7 @@ LOCAL_SRC_FILES += \
		core/java/android/app/IAppTask.aidl \
		core/java/android/app/ITaskStackListener.aidl \
		core/java/android/app/IBackupAgent.aidl \
		core/java/android/app/IEphemeralResolver.aidl \
		core/java/android/app/IInstrumentationWatcher.aidl \
		core/java/android/app/INotificationManager.aidl \
		core/java/android/app/IProcessObserver.aidl \
		@@ -305,7 +306,6 @@ LOCAL_SRC_FILES += \
		core/java/com/android/internal/app/IAppOpsService.aidl \
		core/java/com/android/internal/app/IAssistScreenshotReceiver.aidl \
		core/java/com/android/internal/app/IBatteryStats.aidl \
		core/java/com/android/internal/app/IEphemeralResolver.aidl \
		core/java/com/android/internal/app/ISoundTriggerService.aidl \
		core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl \
		core/java/com/android/internal/app/IVoiceInteractionSessionListener.aidl \

api/system-current.txt

+9 −0

Original line number	Diff line number	Diff line
		@@ -4525,6 +4525,15 @@ package android.app {
		field public static final int VISIBILITY_VISIBLE_NOTIFY_ONLY_COMPLETION = 3; // 0x3
		}

		public abstract class EphemeralResolverService extends android.app.Service {
		ctor public EphemeralResolverService();
		method public final void attachBaseContext(android.content.Context);
		method public final android.os.IBinder onBind(android.content.Intent);
		method public abstract java.util.List<android.content.pm.EphemeralResolveInfo> onEphemeralResolveInfoList(int[], int);
		field public static final java.lang.String EXTRA_RESOLVE_INFO = "android.app.extra.RESOLVE_INFO";
		field public static final java.lang.String EXTRA_SEQUENCE = "android.app.extra.SEQUENCE";
		}

		public class ExpandableListActivity extends android.app.Activity implements android.widget.ExpandableListView.OnChildClickListener android.widget.ExpandableListView.OnGroupCollapseListener android.widget.ExpandableListView.OnGroupExpandListener android.view.View.OnCreateContextMenuListener {
		ctor public ExpandableListActivity();
		method public android.widget.ExpandableListAdapter getExpandableListAdapter();

core/java/com/android/internal/app/EphemeralResolveInfo.aidl→core/java/android/app/EphemeralResolveInfo.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,6 +14,6 @@
		** limitations under the License.
		*/

		package com.android.internal.app;
		package android.app;

		parcelable EphemeralResolveInfo;

core/java/com/android/internal/app/EphemeralResolverService.java→core/java/android/app/EphemeralResolverService.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		package com.android.internal.app;
		package android.app;

		import android.annotation.SystemApi;
		import android.app.Service;
		@@ -37,9 +37,9 @@ import java.util.List;
		*/
		@SystemApi
		public abstract class EphemeralResolverService extends Service {
		public static final String EXTRA_RESOLVE_INFO = "com.android.internal.app.RESOLVE_INFO";
		public static final String EXTRA_SEQUENCE = "com.android.internal.app.SEQUENCE";
		private static final String EXTRA_PREFIX = "com.android.internal.app.PREFIX";
		public static final String EXTRA_RESOLVE_INFO = "android.app.extra.RESOLVE_INFO";
		public static final String EXTRA_SEQUENCE = "android.app.extra.SEQUENCE";
		private static final String EXTRA_PREFIX = "android.app.PREFIX";
		private Handler mHandler;

		/**
		@@ -50,11 +50,11 @@ public abstract class EphemeralResolverService extends Service {
		* be used when comparing against the digest prefixes as all bits might
		* not be set.
		*/
		protected abstract List<EphemeralResolveInfo> getEphemeralResolveInfoList(
		public abstract List<EphemeralResolveInfo> onEphemeralResolveInfoList(
		int digestPrefix[], int prefixMask);

		@Override
		protected final void attachBaseContext(Context base) {
		public final void attachBaseContext(Context base) {
		super.attachBaseContext(base);
		mHandler = new ServiceHandler(base.getMainLooper());
		}
		@@ -91,7 +91,7 @@ public abstract class EphemeralResolverService extends Service {
		final IRemoteCallback callback = (IRemoteCallback) message.obj;
		final int[] digestPrefix = message.getData().getIntArray(EXTRA_PREFIX);
		final List<EphemeralResolveInfo> resolveInfo =
		getEphemeralResolveInfoList(digestPrefix, message.arg1);
		onEphemeralResolveInfoList(digestPrefix, message.arg1);
		final Bundle data = new Bundle();
		data.putInt(EXTRA_SEQUENCE, message.arg2);
		data.putParcelableList(EXTRA_RESOLVE_INFO, resolveInfo);

core/java/com/android/internal/app/IEphemeralResolver.aidl→core/java/android/app/IEphemeralResolver.aidl

+2 −2

Original line number	Diff line number	Diff line
		@@ -14,11 +14,11 @@
		* limitations under the License.
		*/

		package com.android.internal.app;
		package android.app;

		import android.content.Intent;
		import android.os.IRemoteCallback;

		/** @hide */
		oneway interface IEphemeralResolver {
		void getEphemeralResolveInfoList(IRemoteCallback callback, in int[] digestPrefix,
		int prefixMask, int sequence);