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

Commit 12020af1 authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Move to lib based statslogging 

- Compile static permission controller statslog lib
- Use the lib to log

Bug: 130246849
Fixes: 129200555
Test: "statsd_testdrive -p com.google.android.permissioncontroller 170"
      and then grant some permissions
Change-Id: I301a75b17ff52c2de6543b17d67ea1dd6cfb4227
parent 7c0b58f4

Android.bp

+16 −0
Original line number Diff line number Diff line
@@ -14,6 +14,21 @@ 
// limitations under the License.

//



genrule {

    name: "statslog-permissioncontroller-java-gen",

    tools: ["stats-log-api-gen"],

    cmd: "$(location stats-log-api-gen) --java $(out) --module permissioncontroller --javaPackage com.android.packageinstaller --javaClass PermissionControllerStatsLog",

    out: ["com/android/packageinstaller/PermissionControllerStatsLog.java"],

}



java_library {

    name: "permissioncontroller-statsd",

    sdk_version: "system_current",



    srcs: [

        ":statslog-permissioncontroller-java-gen",

    ],

}



android_app {

    name: "PermissionController",
@@ -54,6 +69,7 @@ android_app { 
        "SettingsLibActionBarShadow",

        "SettingsLibProgressBar",

        "androidx.annotation_annotation",

        "permissioncontroller-statsd"

    ],



    proto: {

src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java

+16 −21
Original line number Diff line number Diff line
@@ -17,23 +17,21 @@ 
package com.android.packageinstaller.permission.ui;



import static android.content.pm.PackageManager.PERMISSION_DENIED;

import static android.util.StatsLogAtoms.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__AUTO_DENIED;

import static android.util.StatsLogAtoms.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__AUTO_GRANTED;

import static android.util.StatsLogAtoms.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED;

import static android.util.StatsLogAtoms.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_POLICY_FIXED;

import static android.util.StatsLogAtoms.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_RESTRICTED_PERMISSION;

import static android.util.StatsLogAtoms.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_USER_FIXED;

import static android.util.StatsLogAtoms.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED;

import static android.util.StatsLogAtoms.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED_WITH_PREJUDICE;

import static android.util.StatsLogAtoms.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_GRANTED;

import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;



import static com.android.packageinstaller.PermissionControllerStatsLog.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__AUTO_DENIED;

import static com.android.packageinstaller.PermissionControllerStatsLog.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__AUTO_GRANTED;

import static com.android.packageinstaller.PermissionControllerStatsLog.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED;

import static com.android.packageinstaller.PermissionControllerStatsLog.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_POLICY_FIXED;

import static com.android.packageinstaller.PermissionControllerStatsLog.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_RESTRICTED_PERMISSION;

import static com.android.packageinstaller.PermissionControllerStatsLog.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_USER_FIXED;

import static com.android.packageinstaller.PermissionControllerStatsLog.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED;

import static com.android.packageinstaller.PermissionControllerStatsLog.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED_WITH_PREJUDICE;

import static com.android.packageinstaller.PermissionControllerStatsLog.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_GRANTED;

import static com.android.packageinstaller.permission.ui.GrantPermissionsViewHandler.DENIED;

import static com.android.packageinstaller.permission.ui.GrantPermissionsViewHandler

        .DENIED_DO_NOT_ASK_AGAIN;

import static com.android.packageinstaller.permission.ui.GrantPermissionsViewHandler.DENIED_DO_NOT_ASK_AGAIN;

import static com.android.packageinstaller.permission.ui.GrantPermissionsViewHandler.GRANTED_ALWAYS;

import static com.android.packageinstaller.permission.ui.GrantPermissionsViewHandler

        .GRANTED_FOREGROUND_ONLY;

import static com.android.packageinstaller.permission.ui.GrantPermissionsViewHandler.GRANTED_FOREGROUND_ONLY;

import static com.android.packageinstaller.permission.utils.Utils.getRequestMessage;



import android.app.Activity;
@@ -53,9 +51,6 @@ import android.text.Spanned; 
import android.util.ArrayMap;

import android.util.Log;

import android.util.Pair;

import android.util.StatsLog;

import android.util.StatsLogAtoms;

import android.util.StatsLogAtoms.PermissionGrantRequestResultReported_Result;

import android.view.KeyEvent;

import android.view.MotionEvent;

import android.view.View;
@@ -66,6 +61,7 @@ import androidx.annotation.NonNull; 
import androidx.annotation.Nullable;



import com.android.packageinstaller.DeviceUtils;

import com.android.packageinstaller.PermissionControllerStatsLog;

import com.android.packageinstaller.permission.model.AppPermissionGroup;

import com.android.packageinstaller.permission.model.AppPermissions;

import com.android.packageinstaller.permission.model.Permission;
@@ -224,8 +220,7 @@ public class GrantPermissionsActivity extends Activity 
     * @param permission The permission that was granted or denied

     * @param result The permission grant result

     */

    private void reportRequestResult(@NonNull String permission,

            @PermissionGrantRequestResultReported_Result int result) {

    private void reportRequestResult(@NonNull String permission, int result) {

        boolean isImplicit = !ArrayUtils.contains(mRequestedPermissions, permission);



        Log.v(LOG_TAG,
@@ -233,7 +228,8 @@ public class GrantPermissionsActivity extends Activity 
                        + " callingPackage=" + mCallingPackage + " permission=" + permission

                        + " isImplicit=" + isImplicit + " result=" + result);



        StatsLog.write(StatsLogAtoms.PERMISSION_GRANT_REQUEST_RESULT_REPORTED, mRequestId,

        PermissionControllerStatsLog.write(

                PermissionControllerStatsLog.PERMISSION_GRANT_REQUEST_RESULT_REPORTED, mRequestId,

                mCallingUid, mCallingPackage, permission, isImplicit, result);

    }
@@ -243,8 +239,7 @@ public class GrantPermissionsActivity extends Activity 
     * @param permissions The permissions that were granted or denied

     * @param result The permission grant result

     */

    private void reportRequestResult(@NonNull String[] permissions,

            @PermissionGrantRequestResultReported_Result int result) {

    private void reportRequestResult(@NonNull String[] permissions, int result) {

        for (String permission : permissions) {

            reportRequestResult(permission, result);

        }