diff --git a/api/current.txt b/api/current.txt index 01edc71191f8e..d97242b347acd 100644 --- a/api/current.txt +++ b/api/current.txt @@ -48575,7 +48575,6 @@ package android.util { method public static boolean logEvent(int); method public static boolean logStart(int); method public static boolean logStop(int); - method public static void write(int, @NonNull java.lang.Object...); } public class StringBuilderPrinter implements android.util.Printer { diff --git a/api/system-current.txt b/api/system-current.txt index 10517a8549a52..54f4781bae184 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9491,22 +9491,6 @@ package android.util { method public static void writeRaw(@NonNull byte[], int); } - public class StatsLogAtoms { - field public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED = 170; // 0xaa - field public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__AUTO_DENIED = 8; // 0x8 - field public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__AUTO_GRANTED = 5; // 0x5 - field public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED = 1; // 0x1 - field public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_POLICY_FIXED = 3; // 0x3 - field public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_RESTRICTED_PERMISSION = 9; // 0x9 - field public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_USER_FIXED = 2; // 0x2 - field public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED = 6; // 0x6 - field public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED_WITH_PREJUDICE = 7; // 0x7 - field public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_GRANTED = 4; // 0x4 - } - - @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @IntDef(prefix="PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__", value={android.util.StatsLogAtoms.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED, android.util.StatsLogAtoms.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_USER_FIXED, android.util.StatsLogAtoms.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_POLICY_FIXED, android.util.StatsLogAtoms.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_GRANTED, android.util.StatsLogAtoms.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__AUTO_GRANTED, android.util.StatsLogAtoms.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED, android.util.StatsLogAtoms.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED_WITH_PREJUDICE, android.util.StatsLogAtoms.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__AUTO_DENIED}) public static @interface StatsLogAtoms.PermissionGrantRequestResultReported_Result { - } - } package android.view { diff --git a/core/java/android/util/StatsLog.java b/core/java/android/util/StatsLog.java index 9da29c0c334e7..cfc092cb78e88 100644 --- a/core/java/android/util/StatsLog.java +++ b/core/java/android/util/StatsLog.java @@ -186,21 +186,6 @@ public final class StatsLog extends StatsLogInternal { return sService; } - /** - * Add a log to the stats log. - * - * @param id The id of the atom - * @param params The parameters of the atom's message. - */ - public static void write(int id, @NonNull Object... params) { - switch (id) { - case PERMISSION_GRANT_REQUEST_RESULT_REPORTED: - write(id, (long) params[0], (int) params[1], (String) params[2], (String) params[3], - (boolean) params[4], (int) params[5]); - break; - } - } - /** * Write an event to stats log using the raw format. * diff --git a/core/java/android/util/StatsLogAtoms.java b/core/java/android/util/StatsLogAtoms.java deleted file mode 100644 index 4780cb58ca063..0000000000000 --- a/core/java/android/util/StatsLogAtoms.java +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Copyright (C) 2019 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.util; - -import static java.lang.annotation.RetentionPolicy.SOURCE; - -import android.annotation.IntDef; -import android.annotation.SystemApi; - -import java.lang.annotation.Retention; - -/** - * Exposed stats logs atom ids. - * - * @hide - */ -@SystemApi -public class StatsLogAtoms { - private StatsLogAtoms() { - } - - /** - * Information about a permission grant request - * - * Usage: {@code StatsLog.write(PERMISSION_GRANT_REQUEST_RESULT_REPORTED, long request_id, - * int requesting_uid, String requesting_package_name, String permission_name, - * boolean is_implicit, @PermissionGrantRequestResultReported_Result int result)} - */ - public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED = - StatsLogInternal.PERMISSION_GRANT_REQUEST_RESULT_REPORTED; - - @Retention(SOURCE) - @IntDef(prefix = "PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__", - value = {PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED, - PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_USER_FIXED, - PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_POLICY_FIXED, - PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_GRANTED, - PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__AUTO_GRANTED, - PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED, - PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED_WITH_PREJUDICE, - PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__AUTO_DENIED}) - public @interface PermissionGrantRequestResultReported_Result {} - - /** - * Possible value of {@link PermissionGrantRequestResultReported_Result}: - * permission request was ignored - */ - public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED = - StatsLogInternal.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED; - - /** - * Possible value of {@link PermissionGrantRequestResultReported_Result}: - * permission request was ignored because it was user fixed - */ - public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_USER_FIXED = - StatsLogInternal.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_USER_FIXED; - - /** - * Possible value of {@link PermissionGrantRequestResultReported_Result}: - * permission request was ignored because it was policy fixed - */ - public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_POLICY_FIXED = - StatsLogInternal.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_POLICY_FIXED; - - /** - * Possible value of {@link PermissionGrantRequestResultReported_Result}: - * permission request was ignored because it was restricted - */ - public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_RESTRICTED_PERMISSION = - StatsLogInternal.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_RESTRICTED_PERMISSION; - - /** - * Possible value of {@link PermissionGrantRequestResultReported_Result}: - * permission was granted by user action - */ - public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_GRANTED = - StatsLogInternal.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_GRANTED; - - /** - * Possible value of {@link PermissionGrantRequestResultReported_Result}: - * permission was automatically granted - */ - public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__AUTO_GRANTED = - StatsLogInternal.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__AUTO_GRANTED; - - /** - * Possible value of {@link PermissionGrantRequestResultReported_Result}: - * permission was denied by user action - */ - public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED = - StatsLogInternal.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED; - - /** - * Possible value of {@link PermissionGrantRequestResultReported_Result}: - * permission was denied with prejudice by the user - */ - public static final int - PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED_WITH_PREJUDICE = - StatsLogInternal - .PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED_WITH_PREJUDICE; - - /** - * Possible value of {@link PermissionGrantRequestResultReported_Result}: - * permission was automatically denied - */ - public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__AUTO_DENIED = - StatsLogInternal.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__AUTO_DENIED; -}