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

Commit fda8a50e authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "writeString8 is a hidden API and is not working on Auto targets" into main

parents ac0c27d6 fae8f25d

core/java/android/app/ondeviceintelligence/Feature.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -137,8 +137,8 @@ public final class Feature implements Parcelable { 
        if (mModelName != null) flg |= 0x4;

        if (mModelName != null) flg |= 0x4;

        dest.writeByte(flg);

        dest.writeByte(flg);

        dest.writeInt(mId);

        dest.writeInt(mId);

        if (mName != null) dest.writeString8(mName);

        if (mName != null) dest.writeString(mName);

        if (mModelName != null) dest.writeString8(mModelName);

        if (mModelName != null) dest.writeString(mModelName);

        dest.writeInt(mType);

        dest.writeInt(mType);

        dest.writeInt(mVariant);

        dest.writeInt(mVariant);

        dest.writeTypedObject(mFeatureParams, flags);

        dest.writeTypedObject(mFeatureParams, flags);

services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceManagerService.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -662,7 +662,11 @@ public class OnDeviceIntelligenceManagerService extends SystemService { 
        }

        }

    }

    }





    @RequiresPermission(Manifest.permission.USE_ON_DEVICE_INTELLIGENCE)

    public void resetTemporaryServices() {

    public void resetTemporaryServices() {

        enforceShellOnly(Binder.getCallingUid(), "resetTemporaryServices");

        mContext.enforceCallingPermission(

                Manifest.permission.USE_ON_DEVICE_INTELLIGENCE, TAG);

        synchronized (mLock) {

        synchronized (mLock) {

            if (mTemporaryHandler != null) {

            if (mTemporaryHandler != null) {

                mTemporaryHandler.removeMessages(MSG_RESET_TEMPORARY_SERVICE);

                mTemporaryHandler.removeMessages(MSG_RESET_TEMPORARY_SERVICE);