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

Commit 446b6a93 authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Disable TRON logging in Permission Controller 

Permission controller will need to be compiled against system-api and
TRON is internal API. There are system-api alternatives but they take
some time to set up.

Hence for now disable the logging and later fix it. First we need to
change the make file of permission controller to enforce system-api or
we will keep on adding usages of internal apis.

Bug: 110953302
Test: Built
Change-Id: I1891ba1d0a87ec928a0ece8423938ee0dffe6dd2
parent 6ee5090f

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

+4 −2
Original line number Diff line number Diff line
@@ -51,14 +51,12 @@ import android.view.WindowManager; 


import androidx.annotation.Nullable;



import com.android.internal.logging.nano.MetricsProto;

import com.android.packageinstaller.DeviceUtils;

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

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

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

import com.android.packageinstaller.permission.ui.auto.GrantPermissionsAutoViewHandler;

import com.android.packageinstaller.permission.utils.ArrayUtils;

import com.android.packageinstaller.permission.utils.EventLogger;

import com.android.packageinstaller.permission.utils.PackageRemovalMonitor;

import com.android.packageinstaller.permission.utils.SafetyNetLogger;

import com.android.permissioncontroller.R;
@@ -313,9 +311,11 @@ public class GrantPermissionsActivity extends Activity 
            for (int permissionNum = 0; permissionNum < numRequestedPermissions; permissionNum++) {

                String permission = mRequestedPermissions[permissionNum];



                /* Replace by @SystemAPI logging

                EventLogger.logPermission(

                        MetricsProto.MetricsEvent.ACTION_PERMISSION_REQUESTED, permission,

                        mAppPermissions.getPackageInfo().packageName);

                 */

            }

        }

    }
@@ -689,9 +689,11 @@ public class GrantPermissionsActivity extends Activity 
                    String permission = mRequestedPermissions[i];



                    if (groupState.mGroup.hasPermission(permission)) {

                        /* Replace by @SystemAPI logging

                        EventLogger.logPermission(

                                MetricsProto.MetricsEvent.ACTION_PERMISSION_DENIED, permission,

                                mAppPermissions.getPackageInfo().packageName);

                         */

                    }

                }

            }

src/com/android/packageinstaller/permission/utils/EventLogger.java

+6 −5
Original line number Diff line number Diff line
@@ -16,15 +16,13 @@ 


package com.android.packageinstaller.permission.utils;



import android.metrics.LogMaker;

import androidx.annotation.NonNull;



import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;



public class EventLogger {

    /*

    Replace by @SystemApi logging

    private static final MetricsLogger sMetricsLogger = new MetricsLogger();



     */

    /**

     * Log that a permission was requested/denied.

     *
@@ -34,10 +32,13 @@ public class EventLogger { 
     */

    public static void logPermission(int action, @NonNull String name,

            @NonNull String packageName) {

        /*

        Replace by @SystemApi logging

        final LogMaker log = new LogMaker(action);

        log.setPackageName(packageName);

        log.addTaggedData(MetricsEvent.FIELD_PERMISSION, name);



        sMetricsLogger.write(log);

        */

    }

}