Merge "Remove SecurityLog.writeEvent(String)"

core/java/android/app/admin/SecurityLog.java

@@ -915,23 +915,6 @@ public class SecurityLog {
     public static native void readEventsOnWrapping(long timestamp, Collection<SecurityEvent> output)
             throws IOException;
 
-    /**
-     * Write a log entry to the security log, with a string payload.
-     *
-     * <p>Security log is part of Android's device management capability that tracks
-     * security-sensitive events for auditing purposes.
-     *
-     * @param tag the tag ID of the security event
-     * @param payload the string payload associated with the tag. Each tag dictates the expected
-     *                meaning of this string.
-     *
-     * @see DevicePolicyManager#setSecurityLoggingEnabled(ComponentName, boolean)
-     * @hide
-     */
-    // TODO(b/218658622): enforce WRITE_SECURITY_LOG in logd.
-    @RequiresPermission(Manifest.permission.WRITE_SECURITY_LOG)
-    public static native int writeEvent(@SecurityLogTag int tag, @NonNull String payload);
-
     /**
      * Write a log entry to the underlying storage, with several payloads.
      * Supported types of payload are: integer, long, float, string plus array of supported types.

core/jni/android_app_admin_SecurityLog.cpp

@@ -84,10 +84,6 @@ static const JNINativeMethod gRegisterMethods[] = {
       "()Z",
       (void*) android_app_admin_SecurityLog_isLoggingEnabled
     },
-    { "writeEvent",
-      "(ILjava/lang/String;)I",
-      (void*) SLog::writeEventString
-    },
     { "writeEvent",
       "(I[Ljava/lang/Object;)I",
       (void*) SLog::writeEventArray