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

Commit b8bee498 authored by Muhammad Qureshi's avatar Muhammad Qureshi
Browse files

Use FrameworkStatsLog instead of StatsLog 

As part of statsd becoming a Mainline module in R, autogenerated
StatsLog.write() calls are going away and replaced by *StatsLog.java
that is autogenerated for each module.
This CL replaces some usages of StatsLog with
FrameworkStatsLog.

Bug: 145952197
Test: m
Change-Id: Ic3b015dc76bb123cebc8ca5eef9c82b5afc37cd3
parent 47c9ac72

packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java

+13 −12
Original line number Diff line number Diff line
@@ -41,13 +41,13 @@ import android.util.AtomicFile; 
import android.util.Base64;

import android.util.Slog;

import android.util.SparseIntArray;

import android.util.StatsLog;

import android.util.TimeUtils;

import android.util.Xml;

import android.util.proto.ProtoOutputStream;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.FrameworkStatsLog;



import libcore.io.IoUtils;
@@ -429,8 +429,9 @@ final class SettingsState { 
            mSettings.put(name, newState);

        }



        StatsLog.write(StatsLog.SETTING_CHANGED, name, value, newState.value, oldValue, tag,

            makeDefault, getUserIdFromKey(mKey), StatsLog.SETTING_CHANGED__REASON__UPDATED);

        FrameworkStatsLog.write(FrameworkStatsLog.SETTING_CHANGED, name, value, newState.value,

                oldValue, tag, makeDefault, getUserIdFromKey(mKey),

                FrameworkStatsLog.SETTING_CHANGED__REASON__UPDATED);



        addHistoricalOperationLocked(HISTORICAL_OPERATION_UPDATE, newState);
@@ -489,9 +490,9 @@ final class SettingsState { 
            if (key.startsWith(prefix) && !keyValues.containsKey(key)) {

                Setting oldState = mSettings.remove(key);



                StatsLog.write(StatsLog.SETTING_CHANGED, key, /* value= */ "", /* newValue= */ "",

                        oldState.value, /* tag */ "", false, getUserIdFromKey(mKey),

                        StatsLog.SETTING_CHANGED__REASON__DELETED);

                FrameworkStatsLog.write(FrameworkStatsLog.SETTING_CHANGED, key,

                        /* value= */ "", /* newValue= */ "", oldState.value, /* tag */ "", false,

                        getUserIdFromKey(mKey), FrameworkStatsLog.SETTING_CHANGED__REASON__DELETED);

                addHistoricalOperationLocked(HISTORICAL_OPERATION_DELETE, oldState);

                changedKeys.add(key); // key was removed

            }
@@ -516,9 +517,9 @@ final class SettingsState { 
                continue;

            }



            StatsLog.write(StatsLog.SETTING_CHANGED, key, value, state.value, oldValue,

                    /* tag */ null, /* make default */ false,

                    getUserIdFromKey(mKey), StatsLog.SETTING_CHANGED__REASON__UPDATED);

            FrameworkStatsLog.write(FrameworkStatsLog.SETTING_CHANGED, key, value, state.value,

                    oldValue, /* tag */ null, /* make default */ false,

                    getUserIdFromKey(mKey), FrameworkStatsLog.SETTING_CHANGED__REASON__UPDATED);

            addHistoricalOperationLocked(HISTORICAL_OPERATION_UPDATE, state);

        }
@@ -544,9 +545,9 @@ final class SettingsState { 


        Setting oldState = mSettings.remove(name);



        StatsLog.write(StatsLog.SETTING_CHANGED, name, /* value= */ "", /* newValue= */ "",

            oldState.value, /* tag */ "", false, getUserIdFromKey(mKey),

            StatsLog.SETTING_CHANGED__REASON__DELETED);

        FrameworkStatsLog.write(FrameworkStatsLog.SETTING_CHANGED, name, /* value= */ "",

                /* newValue= */ "", oldState.value, /* tag */ "", false, getUserIdFromKey(mKey),

                FrameworkStatsLog.SETTING_CHANGED__REASON__DELETED);



        updateMemoryUsagePerPackageLocked(oldState.packageName, oldState.value,

                null, oldState.defaultValue, null);

services/core/java/com/android/server/pm/BackgroundDexOptService.java

+2 −2
Original line number Diff line number Diff line
@@ -36,9 +36,9 @@ import android.os.UserHandle; 
import android.os.storage.StorageManager;

import android.util.ArraySet;

import android.util.Log;

import android.util.StatsLog;



import com.android.internal.util.ArrayUtils;

import com.android.internal.util.FrameworkStatsLog;

import com.android.server.LocalServices;

import com.android.server.PinnerService;

import com.android.server.pm.dex.DexManager;
@@ -444,7 +444,7 @@ public class BackgroundDexOptService extends JobService { 
        }



        if (dex_opt_performed) {

            StatsLog.write(StatsLog.APP_DOWNGRADED, pkg, package_size_before,

            FrameworkStatsLog.write(FrameworkStatsLog.APP_DOWNGRADED, pkg, package_size_before,

                    getPackageSize(pm, pkg), /*aggressive=*/ false);

        }

        return dex_opt_performed;

services/core/java/com/android/server/pm/PackageManagerService.java

+9 −6
Original line number Diff line number Diff line
@@ -288,7 +288,6 @@ import android.util.Slog; 
import android.util.SparseArray;

import android.util.SparseBooleanArray;

import android.util.SparseIntArray;

import android.util.StatsLog;

import android.util.TimingsTraceLog;

import android.util.Xml;

import android.util.apk.ApkSignatureVerifier;
@@ -310,6 +309,7 @@ import com.android.internal.util.ArrayUtils; 
import com.android.internal.util.ConcurrentUtils;

import com.android.internal.util.DumpUtils;

import com.android.internal.util.FastXmlSerializer;

import com.android.internal.util.FrameworkStatsLog;

import com.android.internal.util.IndentingPrintWriter;

import com.android.internal.util.Preconditions;

import com.android.server.AttributeCache;
@@ -2163,7 +2163,8 @@ public class PackageManagerService extends IPackageManager.Stub 
                                getPackageExternalStorageType(volume, isExternal(res.pkg));

                        // If the package was installed externally, log it.

                        if (packageExternalStorageType != StorageEnums.UNKNOWN) {

                            StatsLog.write(StatsLog.APP_INSTALL_ON_EXTERNAL_STORAGE_REPORTED,

                            FrameworkStatsLog.write(

                                    FrameworkStatsLog.APP_INSTALL_ON_EXTERNAL_STORAGE_REPORTED,

                                    packageExternalStorageType, res.pkg.getPackageName());

                        }

                    }
@@ -22179,13 +22180,15 @@ public class PackageManagerService extends IPackageManager.Stub 














        if (!isPreviousLocationExternal && isExternal(pkg)) {















            // Move from internal to external storage.













            StatsLog.write(StatsLog.APP_MOVED_STORAGE_REPORTED, packageExternalStorageType,













                    StatsLog.APP_MOVED_STORAGE_REPORTED__MOVE_TYPE__TO_EXTERNAL,













            FrameworkStatsLog.write(FrameworkStatsLog.APP_MOVED_STORAGE_REPORTED,













                    packageExternalStorageType,













                    FrameworkStatsLog.APP_MOVED_STORAGE_REPORTED__MOVE_TYPE__TO_EXTERNAL,















                    packageName);















        } else if (isPreviousLocationExternal && !isExternal(pkg)) {















            // Move from external to internal storage.













            StatsLog.write(StatsLog.APP_MOVED_STORAGE_REPORTED, packageExternalStorageType,













                    StatsLog.APP_MOVED_STORAGE_REPORTED__MOVE_TYPE__TO_INTERNAL,













            FrameworkStatsLog.write(FrameworkStatsLog.APP_MOVED_STORAGE_REPORTED,













                    packageExternalStorageType,













                    FrameworkStatsLog.APP_MOVED_STORAGE_REPORTED__MOVE_TYPE__TO_INTERNAL,















                    packageName);















        }















    }