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

Commit 54e91344 authored by Sunny Goyal's avatar Sunny Goyal Committed by Winson Chung
Browse files

Adding initial implementation of Prediction client/service API 



Test: Build sample app, ensure that app prediction service gets client
      requests
Bug: 111701043
Change-Id: I33aceb2de31552b2d740dc333559d68728753e40
Signed-off-by: default avatarWinson Chung <winsonc@google.com>
parent 00112e6f

Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -104,6 +104,8 @@ java_defaults { 
        "core/java/android/app/backup/IRestoreObserver.aidl",

        "core/java/android/app/backup/IRestoreSession.aidl",

        "core/java/android/app/backup/ISelectBackupTransportCallback.aidl",

        "core/java/android/app/prediction/IPredictionCallback.aidl",

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

        "core/java/android/app/role/IOnRoleHoldersChangedListener.aidl",

        "core/java/android/app/role/IRoleManager.aidl",

        "core/java/android/app/role/IRoleManagerCallback.aidl",
@@ -273,6 +275,7 @@ java_defaults { 
        "core/java/android/rolecontrollerservice/IRoleControllerService.aidl",

        ":keystore_aidl",

        "core/java/android/security/keymaster/IKeyAttestationApplicationIdProvider.aidl",

        "core/java/android/service/appprediction/IPredictionService.aidl",

        "core/java/android/service/autofill/augmented/IAugmentedAutofillService.aidl",

        "core/java/android/service/autofill/augmented/IFillCallback.aidl",

        "core/java/android/service/autofill/IAutoFillService.aidl",

api/system-current.txt

+101 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ package android { 
    field public static final java.lang.String MANAGE_ACCESSIBILITY = "android.permission.MANAGE_ACCESSIBILITY";

    field public static final java.lang.String MANAGE_ACTIVITY_STACKS = "android.permission.MANAGE_ACTIVITY_STACKS";

    field public static final java.lang.String MANAGE_APP_OPS_RESTRICTIONS = "android.permission.MANAGE_APP_OPS_RESTRICTIONS";

    field public static final java.lang.String MANAGE_APP_PREDICTIONS = "android.permission.MANAGE_APP_PREDICTIONS";

    field public static final java.lang.String MANAGE_APP_TOKENS = "android.permission.MANAGE_APP_TOKENS";

    field public static final java.lang.String MANAGE_AUTO_FILL = "android.permission.MANAGE_AUTO_FILL";

    field public static final java.lang.String MANAGE_CARRIER_OEM_UNLOCK_STATE = "android.permission.MANAGE_CARRIER_OEM_UNLOCK_STATE";
@@ -856,6 +857,87 @@ package android.app.job { 


}



package android.app.prediction {



  public final class AppPredictionContext implements android.os.Parcelable {

    method public int describeContents();

    method public android.os.Bundle getExtras();

    method public java.lang.String getPackageName();

    method public int getPredictedTargetCount();

    method public java.lang.String getUiSurface();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.app.prediction.AppPredictionContext> CREATOR;

  }



  public static final class AppPredictionContext.Builder {

    method public android.app.prediction.AppPredictionContext build();

    method public android.app.prediction.AppPredictionContext.Builder setExtras(android.os.Bundle);

    method public android.app.prediction.AppPredictionContext.Builder setPredictedTargetCount(int);

    method public android.app.prediction.AppPredictionContext.Builder setUiSurface(java.lang.String);

  }



  public final class AppPredictionManager {

    method public android.app.prediction.AppPredictor createAppPredictionSession(android.app.prediction.AppPredictionContext);

  }



  public final class AppPredictionSessionId implements android.os.Parcelable {

    method public int describeContents();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.app.prediction.AppPredictionSessionId> CREATOR;

  }



  public final class AppPredictor {

    method public void destroy();

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

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

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

    method public void requestPredictionUpdate();

    method public void sortTargets(java.util.List<android.app.prediction.AppTarget>, java.util.concurrent.Executor, java.util.function.Consumer<java.util.List<android.app.prediction.AppTarget>>);

    method public void unregisterPredictionUpdates(android.app.prediction.AppPredictor.Callback);

  }



  public static abstract interface AppPredictor.Callback {

    method public abstract void onTargetsAvailable(java.util.List<android.app.prediction.AppTarget>);

  }



  public final class AppTarget implements android.os.Parcelable {

    method public int describeContents();

    method public java.lang.String getClassName();

    method public android.app.prediction.AppTargetId getId();

    method public java.lang.String getPackageName();

    method public int getRank();

    method public android.content.pm.ShortcutInfo getShortcutInfo();

    method public android.os.UserHandle getUser();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.app.prediction.AppTarget> CREATOR;

  }



  public final class AppTargetEvent implements android.os.Parcelable {

    method public int describeContents();

    method public int getAction();

    method public java.lang.String getLaunchLocation();

    method public android.app.prediction.AppTarget getTarget();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final int ACTION_DISMISS = 2; // 0x2

    field public static final int ACTION_LAUNCH = 1; // 0x1

    field public static final int ACTION_PIN = 3; // 0x3

    field public static final android.os.Parcelable.Creator<android.app.prediction.AppTargetEvent> CREATOR;

  }



  public static final class AppTargetEvent.Builder {

    ctor public AppTargetEvent.Builder(android.app.prediction.AppTarget, int);

    method public android.app.prediction.AppTargetEvent build();

    method public android.app.prediction.AppTargetEvent.Builder setLaunchLocation(java.lang.String);

  }



  public final class AppTargetId implements android.os.Parcelable {

    method public int describeContents();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.app.prediction.AppTargetId> CREATOR;

  }



}



package android.app.role {



  public abstract interface OnRoleHoldersChangedListener {
@@ -1042,6 +1124,7 @@ package android.content { 
    method public abstract void sendBroadcastAsUser(android.content.Intent, android.os.UserHandle, java.lang.String, android.os.Bundle);

    method public abstract void sendOrderedBroadcast(android.content.Intent, java.lang.String, android.os.Bundle, android.content.BroadcastReceiver, android.os.Handler, int, java.lang.String, android.os.Bundle);

    method public void startActivityAsUser(android.content.Intent, android.os.UserHandle);

    field public static final java.lang.String APP_PREDICTION_SERVICE = "app_prediction";

    field public static final java.lang.String BACKUP_SERVICE = "backup";

    field public static final java.lang.String CONTEXTHUB_SERVICE = "contexthub";

    field public static final java.lang.String EUICC_CARD_SERVICE = "euicc_card";
@@ -5146,6 +5229,24 @@ package android.security.keystore.recovery { 


}



package android.service.appprediction {



  public abstract class AppPredictionService extends android.app.Service {

    ctor public AppPredictionService();

    method public abstract void onAppTargetEvent(android.app.prediction.AppPredictionSessionId, android.app.prediction.AppTargetEvent);

    method public final android.os.IBinder onBind(android.content.Intent);

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

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

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

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

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

    method public void onStartPredictionUpdates();

    method public void onStopPredictionUpdates();

    method public final void updatePredictions(android.app.prediction.AppPredictionSessionId, java.util.List<android.app.prediction.AppTarget>);

  }



}



package android.service.autofill {



  public abstract class AutofillFieldClassificationService extends android.app.Service {

core/java/android/app/SystemServiceRegistry.java

+10 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.app.admin.DevicePolicyManager; 
import android.app.admin.IDevicePolicyManager;

import android.app.job.IJobScheduler;

import android.app.job.JobScheduler;

import android.app.prediction.AppPredictionManager;

import android.app.role.RoleManager;

import android.app.slice.SliceManager;

import android.app.timedetector.TimeDetector;
@@ -1095,6 +1096,15 @@ final class SystemServiceRegistry { 
                return null;

            }});



        registerService(Context.APP_PREDICTION_SERVICE, AppPredictionManager.class,

                new CachedServiceFetcher<AppPredictionManager>() {

            @Override

            public AppPredictionManager createService(ContextImpl ctx)

                    throws ServiceNotFoundException {

                return new AppPredictionManager(ctx);

            }

        });



        registerService(Context.VR_SERVICE, VrManager.class, new CachedServiceFetcher<VrManager>() {

            @Override

            public VrManager createService(ContextImpl ctx) throws ServiceNotFoundException {

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

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/**

 * Copyright (c) 2018, The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.app.prediction;



parcelable AppPredictionContext;

core/java/android/app/prediction/AppPredictionContext.java

0 → 100644
+158 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package android.app.prediction;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.content.Context;

import android.os.Bundle;

import android.os.Parcel;

import android.os.Parcelable;



/**

 * TODO(b/111701043): Add java docs

 *

 * @hide

 */

@SystemApi

public final class AppPredictionContext implements Parcelable {



    private final int mPredictedTargetCount;

    @NonNull

    private final String mUiSurface;

    @NonNull

    private final String mPackageName;

    @Nullable

    private final Bundle mExtras;



    private AppPredictionContext(@NonNull String uiSurface, int numPredictedTargets,

            @NonNull String packageName, @Nullable Bundle extras) {

        mUiSurface = uiSurface;

        mPredictedTargetCount = numPredictedTargets;

        mPackageName = packageName;

        mExtras = extras;

    }



    private AppPredictionContext(Parcel parcel) {

        mUiSurface = parcel.readString();

        mPredictedTargetCount = parcel.readInt();

        mPackageName = parcel.readString();

        mExtras = parcel.readBundle();

    }



    public String getUiSurface() {

        return mUiSurface;

    }



    public int getPredictedTargetCount() {

        return mPredictedTargetCount;

    }



    @NonNull

    public String getPackageName() {

        return mPackageName;

    }



    @Nullable

    public Bundle getExtras() {

        return mExtras;

    }



    @Override

    public int describeContents() {

        return 0;

    }



    @Override

    public void writeToParcel(Parcel dest, int flags) {

        dest.writeString(mUiSurface);

        dest.writeInt(mPredictedTargetCount);

        dest.writeString(mPackageName);

        dest.writeBundle(mExtras);

    }



    /**

     * @see Parcelable.Creator

     */

    public static final Parcelable.Creator<AppPredictionContext> CREATOR =

            new Parcelable.Creator<AppPredictionContext>() {

                public AppPredictionContext createFromParcel(Parcel parcel) {

                    return new AppPredictionContext(parcel);

                }



                public AppPredictionContext[] newArray(int size) {

                    return new AppPredictionContext[size];

                }

            };



    /**

     * A builder for app prediction contexts.

     * @hide

     */

    @SystemApi

    public static final class Builder {



        @NonNull

        private final String mPackageName;



        private int mPredictedTargetCount;

        @Nullable

        private String mUiSurface;

        @Nullable

        private Bundle mExtras;



        /**

         * @hide

         */

        public Builder(@NonNull Context context) {

            mPackageName = context.getPackageName();

        }





        /**

         * Sets the number of prediction targets as a hint.

         */

        public Builder setPredictedTargetCount(int predictedTargetCount) {

            mPredictedTargetCount = predictedTargetCount;

            return this;

        }



        /**

         * Sets the UI surface.

         */

        public Builder setUiSurface(@Nullable String uiSurface) {

            mUiSurface = uiSurface;

            return this;

        }



        /**

         * Sets the extras.

         */

        public Builder setExtras(@Nullable Bundle extras) {

            mExtras = extras;

            return this;

        }



        /**

         * Builds a new context instance.

         */

        public AppPredictionContext build() {

            return new AppPredictionContext(mUiSurface, mPredictedTargetCount, mPackageName,

                    mExtras);

        }

    }

}