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

Commit 11254ade authored by Adam Skory's avatar Adam Skory Committed by Android (Google) Code Review
Browse files

Merge "Add provideAssistData attr to public.xml" into klp-dev

parents 29565900 16731d4d

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -845,6 +845,7 @@ package android { 
    field public static final int prompt = 16843131; // 0x101017b

    field public static final int propertyName = 16843489; // 0x10102e1

    field public static final int protectionLevel = 16842761; // 0x1010009

    field public static final int provideAssistData = 16843756; // 0x10103ec

    field public static final int publicKey = 16843686; // 0x10103a6

    field public static final int queryActionMsg = 16843227; // 0x10101db

    field public static final int queryAfterZeroResults = 16843394; // 0x1010282

core/java/android/content/pm/ServiceInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ public class ServiceInfo extends ComponentInfo 
     * Bit in {@link #flags}: If set,

     * {@link android.app.Service#onProvideAssistData(android.os.Bundle)} will

     * be called on the service when it is running in the foreground. Set from

     * the android.R.attr#provideAssistData attribute.

     * the {@link android.R.attr#provideAssistData} attribute.

     */

    public static final int FLAG_PROVIDE_ASSIST_DATA = 0x0004;

core/res/res/values/public.xml

+1 −0
Original line number Diff line number Diff line
@@ -2075,5 +2075,6 @@ 
  <public type="attr" name="supportsSwitchingToNextInputMethod" />

  <public type="attr" name="requireDeviceUnlock" />

  <public type="attr" name="apduServiceBanner" />

  <public type="attr" name="provideAssistData" />



</resources>

services/java/com/android/server/am/ActivityManagerService.java

+4 −3
Original line number Diff line number Diff line
@@ -407,12 +407,13 @@ public final class ActivityManagerService extends ActivityManagerNative 
        @Override

        public void run() {

            if (activityExtras == null) {

                Slog.w(TAG, "getAssistContextExtras failed: timeout retrieving from " + activity);

                Slog.w(TAG, "getAssistContextExtras failed: timeout retrieving from activtity "

                        + activity);

            }

            for (int i = 0; i < services.size(); i++) {

                if (servicesExtras[i] == null) {

                    Slog.w(TAG, "getAssistContextExtras failed: timeout retrieving from "

                            + services.get(i));

                    Slog.w(TAG, "getAssistContextExtras failed: timeout retrieving from service "

                            + i + " " + services.get(i));

                }

            }

            synchronized (this) {