Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move EphemeralResolverService

Browse Source 
It should not have been under com.android.internal

Fixes: 30673742
Change-Id: I2277aa4a4799fa59bf68af7c4cfcb4e1216aeb8d
This commit is contained in:
Todd Kennedy
2016-08-04 14:27:15 -07:00
parent 6cecc8dc27
commit 31b95e0265
6 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Android.mk
View File

@@ -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 \

9
api/system-current.txt
View File

@@ -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();

2
core/java/com/android/internal/app/EphemeralResolveInfo.aidl → core/java/android/app/EphemeralResolveInfo.aidl
View File

@@ -14,6 +14,6 @@
** limitations under the License.
*/
package com.android.internal.app;
package android.app;
parcelable EphemeralResolveInfo;

14
core/java/com/android/internal/app/EphemeralResolverService.java → core/java/android/app/EphemeralResolverService.java
View File

@@ -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);

4
core/java/com/android/internal/app/IEphemeralResolver.aidl → core/java/android/app/IEphemeralResolver.aidl
View File

@@ -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);

5
services/core/java/com/android/server/pm/EphemeralResolverConnection.java
View File

@@ -16,6 +16,8 @@
package com.android.server.pm;
import android.app.EphemeralResolverService;
import android.app.IEphemeralResolver;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -30,9 +32,6 @@ import android.os.SystemClock;
import android.os.UserHandle;
import android.util.TimedRemoteCaller;
import com.android.internal.app.EphemeralResolverService;
import com.android.internal.app.IEphemeralResolver;
import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.util.ArrayList;