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

Commit 134e2345 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I572d8977,I7fef00c7 into main 

* changes:
  Dump WearableSensingManager binder to know which package is bound.
  Add aconfig flag for dumping WearableSensingManagerService.
parents 826d5f28 aa2ce822

core/java/android/app/wearable/flags.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -55,3 +55,11 @@ flag { 
    description: "This flag enables the APIs for providing read-only ParcelFileDescriptors to the WearableSensingService."

    bug: "358130861"

}



flag {

    name: "enable_wearable_sensing_manager_service_dump"

    is_exported: false

    namespace: "machine_learning"

    description: "This flag enables the system WearableSensingManager binder to dump information."

    bug: "437414825"

}

services/core/java/com/android/server/wearable/WearableSensingManagerService.java

+20 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.app.ActivityOptions; 
import android.app.BroadcastOptions;

import android.app.PendingIntent;

import android.app.ambientcontext.AmbientContextEvent;

import android.app.wearable.Flags;

import android.app.wearable.IWearableSensingCallback;

import android.app.wearable.IWearableSensingManager;

import android.app.wearable.WearableSensingDataRequest;
@@ -47,11 +48,14 @@ import android.util.Slog; 


import com.android.internal.R;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.util.DumpUtils;

import com.android.server.SystemService;

import com.android.server.infra.AbstractMasterSystemService;

import com.android.server.infra.FrameworkResourcesServiceNameResolver;

import com.android.server.utils.quota.MultiRateLimiter;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.time.Duration;

import java.util.HashSet;

import java.util.Objects;
@@ -679,6 +683,22 @@ public class WearableSensingManagerService 
                            args);

        }





        @Override

        protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

            if (!Flags.enableWearableSensingManagerServiceDump()) {

                return;

            }



            if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) {

                return;

            }



            synchronized (mLock) {

                dumpLocked("", pw);

            }

        }



        @Nullable

        private WearableSensingManagerPerUserService validateAndGetPerUserService(

                @Nullable RemoteCallback statusCallback) {