diff options
| -rw-r--r-- | core/java/android/app/ondeviceintelligence/Feature.java | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceManagerService.java | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/app/ondeviceintelligence/Feature.java b/core/java/android/app/ondeviceintelligence/Feature.java index fd0379a046cc..bcc56073e51c 100644 --- a/core/java/android/app/ondeviceintelligence/Feature.java +++ b/core/java/android/app/ondeviceintelligence/Feature.java @@ -137,8 +137,8 @@ public final class Feature implements Parcelable { if (mModelName != null) flg |= 0x4; dest.writeByte(flg); dest.writeInt(mId); - if (mName != null) dest.writeString8(mName); - if (mModelName != null) dest.writeString8(mModelName); + if (mName != null) dest.writeString(mName); + if (mModelName != null) dest.writeString(mModelName); dest.writeInt(mType); dest.writeInt(mVariant); dest.writeTypedObject(mFeatureParams, flags); diff --git a/services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceManagerService.java b/services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceManagerService.java index af339dfe541d..8f6aa955c0b1 100644 --- a/services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceManagerService.java +++ b/services/core/java/com/android/server/ondeviceintelligence/OnDeviceIntelligenceManagerService.java @@ -662,7 +662,11 @@ public class OnDeviceIntelligenceManagerService extends SystemService { } } + @RequiresPermission(Manifest.permission.USE_ON_DEVICE_INTELLIGENCE) public void resetTemporaryServices() { + enforceShellOnly(Binder.getCallingUid(), "resetTemporaryServices"); + mContext.enforceCallingPermission( + Manifest.permission.USE_ON_DEVICE_INTELLIGENCE, TAG); synchronized (mLock) { if (mTemporaryHandler != null) { mTemporaryHandler.removeMessages(MSG_RESET_TEMPORARY_SERVICE); |