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

Commit 6d623e49 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Updating onLocation related APIs to onLaunchLocation as per API review"

parents 40f9d02a c2baa4d7

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -1064,7 +1064,7 @@ package android.app.prediction { 
  public final class AppPredictor {

    method public void destroy();

    method public void notifyAppTargetEvent(@NonNull android.app.prediction.AppTargetEvent);

    method public void notifyLocationShown(@NonNull String, @NonNull java.util.List<android.app.prediction.AppTargetId>);

    method public void notifyLaunchLocationShown(@NonNull String, @NonNull java.util.List<android.app.prediction.AppTargetId>);

    method public void registerPredictionUpdates(@NonNull java.util.concurrent.Executor, @NonNull android.app.prediction.AppPredictor.Callback);

    method public void requestPredictionUpdate();

    method @Nullable public void sortTargets(@NonNull java.util.List<android.app.prediction.AppTarget>, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.util.List<android.app.prediction.AppTarget>>);
@@ -6295,7 +6295,7 @@ package android.service.appprediction { 
    method @NonNull public final android.os.IBinder onBind(@NonNull android.content.Intent);

    method public void onCreatePredictionSession(@NonNull android.app.prediction.AppPredictionContext, @NonNull android.app.prediction.AppPredictionSessionId);

    method @MainThread public void onDestroyPredictionSession(@NonNull android.app.prediction.AppPredictionSessionId);

    method @MainThread public abstract void onLocationShown(@NonNull android.app.prediction.AppPredictionSessionId, @NonNull String, @NonNull java.util.List<android.app.prediction.AppTargetId>);

    method @MainThread public abstract void onLaunchLocationShown(@NonNull android.app.prediction.AppPredictionSessionId, @NonNull String, @NonNull java.util.List<android.app.prediction.AppTargetId>);

    method @MainThread public abstract void onRequestPredictionUpdate(@NonNull android.app.prediction.AppPredictionSessionId);

    method @MainThread public abstract void onSortAppTargets(@NonNull android.app.prediction.AppPredictionSessionId, @NonNull java.util.List<android.app.prediction.AppTarget>, @NonNull android.os.CancellationSignal, @NonNull java.util.function.Consumer<java.util.List<android.app.prediction.AppTarget>>);

    method @MainThread public void onStartPredictionUpdates();

api/test-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ package android.app.prediction { 
    method public void destroy();

    method public android.app.prediction.AppPredictionSessionId getSessionId();

    method public void notifyAppTargetEvent(@NonNull android.app.prediction.AppTargetEvent);

    method public void notifyLocationShown(@NonNull String, @NonNull java.util.List<android.app.prediction.AppTargetId>);

    method public void notifyLaunchLocationShown(@NonNull String, @NonNull java.util.List<android.app.prediction.AppTargetId>);

    method public void registerPredictionUpdates(@NonNull java.util.concurrent.Executor, @NonNull android.app.prediction.AppPredictor.Callback);

    method public void requestPredictionUpdate();

    method @Nullable public void sortTargets(@NonNull java.util.List<android.app.prediction.AppTarget>, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.util.List<android.app.prediction.AppTarget>>);
@@ -2253,7 +2253,7 @@ package android.service.appprediction { 
    method @NonNull public final android.os.IBinder onBind(@NonNull android.content.Intent);

    method public void onCreatePredictionSession(@NonNull android.app.prediction.AppPredictionContext, @NonNull android.app.prediction.AppPredictionSessionId);

    method @MainThread public void onDestroyPredictionSession(@NonNull android.app.prediction.AppPredictionSessionId);

    method @MainThread public abstract void onLocationShown(@NonNull android.app.prediction.AppPredictionSessionId, @NonNull String, @NonNull java.util.List<android.app.prediction.AppTargetId>);

    method @MainThread public abstract void onLaunchLocationShown(@NonNull android.app.prediction.AppPredictionSessionId, @NonNull String, @NonNull java.util.List<android.app.prediction.AppTargetId>);

    method @MainThread public abstract void onRequestPredictionUpdate(@NonNull android.app.prediction.AppPredictionSessionId);

    method @MainThread public abstract void onSortAppTargets(@NonNull android.app.prediction.AppPredictionSessionId, @NonNull java.util.List<android.app.prediction.AppTarget>, @NonNull android.os.CancellationSignal, @NonNull java.util.function.Consumer<java.util.List<android.app.prediction.AppTarget>>);

    method @MainThread public void onStartPredictionUpdates();

core/java/android/app/prediction/AppPredictor.java

+2 −2
Original line number Diff line number Diff line
@@ -131,14 +131,14 @@ public final class AppPredictor { 
     * @param launchLocation The launch location where the targets are shown to the user.

     * @param targetIds List of {@link AppTargetId}s that are shown to the user.

     */

    public void notifyLocationShown(@NonNull String launchLocation,

    public void notifyLaunchLocationShown(@NonNull String launchLocation,

            @NonNull List<AppTargetId> targetIds) {

        if (mIsClosed.get()) {

            throw new IllegalStateException("This client has already been destroyed.");

        }



        try {

            mPredictionManager.notifyLocationShown(mSessionId, launchLocation,

            mPredictionManager.notifyLaunchLocationShown(mSessionId, launchLocation,

                    new ParceledListSlice<>(targetIds));

        } catch (RemoteException e) {

            Log.e(TAG, "Failed to notify location shown event", e);

core/java/android/app/prediction/IPredictionManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ interface IPredictionManager { 


    void notifyAppTargetEvent(in AppPredictionSessionId sessionId, in AppTargetEvent event);



    void notifyLocationShown(in AppPredictionSessionId sessionId, in String launchLocation,

    void notifyLaunchLocationShown(in AppPredictionSessionId sessionId, in String launchLocation,

            in ParceledListSlice targetIds);



    void sortAppTargets(in AppPredictionSessionId sessionId, in ParceledListSlice targets,

core/java/android/service/appprediction/AppPredictionService.java

+6 −5
Original line number Diff line number Diff line
@@ -86,11 +86,12 @@ public abstract class AppPredictionService extends Service { 
        }



        @Override

        public void notifyLocationShown(AppPredictionSessionId sessionId, String launchLocation,

                ParceledListSlice targetIds) {

        public void notifyLaunchLocationShown(AppPredictionSessionId sessionId,

                String launchLocation, ParceledListSlice targetIds) {

            mHandler.sendMessage(

                    obtainMessage(AppPredictionService::onLocationShown, AppPredictionService.this,

                            sessionId, launchLocation, targetIds.getList()));

                    obtainMessage(AppPredictionService::onLaunchLocationShown,

                            AppPredictionService.this, sessionId, launchLocation,

                            targetIds.getList()));

        }



        @Override
@@ -158,7 +159,7 @@ public abstract class AppPredictionService extends Service { 
     * Called by a client app to indication a particular location has been shown to the user.

     */

    @MainThread

    public abstract void onLocationShown(@NonNull AppPredictionSessionId sessionId,

    public abstract void onLaunchLocationShown(@NonNull AppPredictionSessionId sessionId,

            @NonNull String launchLocation, @NonNull List<AppTargetId> targetIds);



    private void doCreatePredictionSession(@NonNull AppPredictionContext context,