Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eaf2a4ef authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge changes from topic "expose_methods" 

* changes:
  Removing references to hidden classes in shared lib.
  Exposing a few more methods in the lib
  Move assist data receiver interface to accessible namespace
parents bb1b5ed7 2cf6ad83

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/app/IAlarmManager.aidl \

	core/java/android/app/IAppTask.aidl \

	core/java/android/app/IApplicationThread.aidl \

	core/java/android/app/IAssistDataReceiver.aidl \

	core/java/android/app/ITaskStackListener.aidl \

	core/java/android/app/IBackupAgent.aidl \

	core/java/android/app/IEphemeralResolver.aidl \
@@ -383,7 +384,6 @@ LOCAL_SRC_FILES += \ 
	core/java/android/speech/tts/ITextToSpeechService.aidl \

	core/java/com/android/internal/app/IAppOpsCallback.aidl \

	core/java/com/android/internal/app/IAppOpsService.aidl \

	core/java/com/android/internal/app/IAssistDataReceiver.aidl \

	core/java/com/android/internal/app/IBatteryStats.aidl \

	core/java/com/android/internal/app/ISoundTriggerService.aidl \

	core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl \

core/java/android/app/IActivityManager.aidl

+2 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.app.ContentProviderHolder; 
import android.app.IApplicationThread;

import android.app.IActivityController;

import android.app.IAppTask;

import android.app.IAssistDataReceiver;

import android.app.IInstrumentationWatcher;

import android.app.IProcessObserver;

import android.app.IServiceConnection;
@@ -63,7 +64,6 @@ import android.os.ParcelFileDescriptor; 
import android.os.PersistableBundle;

import android.os.StrictMode;

import android.service.voice.IVoiceInteractionSession;

import com.android.internal.app.IAssistDataReceiver;

import com.android.internal.app.IVoiceInteractor;

import com.android.internal.os.IResultReceiver;

import com.android.internal.policy.IKeyguardDismissCallback;
@@ -423,7 +423,7 @@ interface IActivityManager { 
    int startAssistantActivity(in String callingPackage, int callingPid, int callingUid,

            in Intent intent, in String resolvedType, in Bundle options, int userId);

    int startRecentsActivity(in IAssistDataReceiver assistDataReceiver, in Bundle options,

            int userId);

            in Bundle activityOptions, int userId);

    int startActivityFromRecents(int taskId, in Bundle options);

    Bundle getActivityOptions(in IBinder token);

    List<IBinder> getAppTasks(in String callingPackage);

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

+1 −1
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.graphics.Bitmap;

import android.os.Bundle;

core/java/android/view/IWindowManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ 


package android.view;



import com.android.internal.app.IAssistDataReceiver;

import com.android.internal.os.IResultReceiver;

import com.android.internal.view.IInputContext;

import com.android.internal.view.IInputMethodClient;

import com.android.internal.policy.IKeyguardDismissCallback;

import com.android.internal.policy.IShortcutService;



import android.app.IAssistDataReceiver;

import android.content.res.CompatibilityInfo;

import android.content.res.Configuration;

import android.graphics.Bitmap;

packages/SystemUI/shared/src/com/android/systemui/shared/recents/model/RecentsTaskLoadPlan.java

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ public class RecentsTaskLoadPlan { 
        Resources res = mContext.getResources();



        // Iterate through each of the tasks and load them according to the load conditions.

        ArrayList<Task> tasks = mStack.getStackTasks();

        ArrayList<Task> tasks = mStack.getTasks();

        int taskCount = tasks.size();

        for (int i = 0; i < taskCount; i++) {

            Task task = tasks.get(i);