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

Commit 7b8cee80 authored by Suprabh Shukla's avatar Suprabh Shukla Committed by Automerger Merge Worker
Browse files

Merge "Count app restriction events" into udc-dev am: f0fe79de 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23047553



Change-Id: If43235e0138e869e1597dcb72d82ca268f9b34e2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 351f9258 f0fe79de

apex/jobscheduler/service/java/com/android/server/AppStateTrackerImpl.java

+7 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@ import android.app.ActivityManagerInternal.AppBackgroundRestrictionListener; 
import android.app.AppOpsManager;

import android.app.AppOpsManager;

import android.app.AppOpsManager.PackageOps;

import android.app.AppOpsManager.PackageOps;

import android.app.IActivityManager;

import android.app.IActivityManager;

import android.app.UidObserver;

import android.app.usage.UsageStatsManager;

import android.app.usage.UsageStatsManager;

import android.content.BroadcastReceiver;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Context;
@@ -54,6 +53,7 @@ import com.android.internal.app.IAppOpsCallback; 
import com.android.internal.app.IAppOpsService;

import com.android.internal.app.IAppOpsService;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.ArrayUtils;

import com.android.internal.util.StatLogger;

import com.android.internal.util.StatLogger;

import com.android.modules.expresslog.Counter;

import com.android.server.AppStateTrackerProto.ExemptedPackage;

import com.android.server.AppStateTrackerProto.ExemptedPackage;

import com.android.server.AppStateTrackerProto.RunAnyInBackgroundRestrictedPackages;

import com.android.server.AppStateTrackerProto.RunAnyInBackgroundRestrictedPackages;

import com.android.server.usage.AppStandbyInternal;

import com.android.server.usage.AppStandbyInternal;
@@ -79,6 +79,9 @@ import java.util.Set; 
public class AppStateTrackerImpl implements AppStateTracker {

public class AppStateTrackerImpl implements AppStateTracker {

    private static final boolean DEBUG = false;

    private static final boolean DEBUG = false;





    private static final String APP_RESTRICTION_COUNTER_METRIC_ID =

            "battery.value_app_background_restricted";



    private final Object mLock = new Object();

    private final Object mLock = new Object();

    private final Context mContext;

    private final Context mContext;
@@ -748,6 +751,9 @@ public class AppStateTrackerImpl implements AppStateTracker { 
            } catch (RemoteException e) {

            } catch (RemoteException e) {

                // Shouldn't happen

                // Shouldn't happen

            }

            }

            if (restricted) {

                Counter.logIncrementWithUid(APP_RESTRICTION_COUNTER_METRIC_ID, uid);

            }

            synchronized (mLock) {

            synchronized (mLock) {

                if (updateForcedAppStandbyUidPackageLocked(uid, packageName, restricted)) {

                if (updateForcedAppStandbyUidPackageLocked(uid, packageName, restricted)) {

                    mHandler.notifyRunAnyAppOpsChanged(uid, packageName);

                    mHandler.notifyRunAnyAppOpsChanged(uid, packageName);