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

Commit 42044fdf authored by Olivier Nshimiye's avatar Olivier Nshimiye Committed by Android (Google) Code Review
Browse files

Merge "Update imports to android.health.connect"

parents c949bea2 e294c20f

core/java/android/app/AppOpsManager.java

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ import android.content.pm.ApplicationInfo; 
import android.content.pm.PackageManager;

import android.content.pm.ParceledListSlice;

import android.database.DatabaseUtils;

import android.healthconnect.HealthConnectManager;

import android.health.connect.HealthConnectManager;

import android.media.AudioAttributes.AttributeUsage;

import android.os.Binder;

import android.os.Build;

core/java/android/app/SystemServiceRegistry.java

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ import android.hardware.location.ContextHubManager; 
import android.hardware.radio.RadioManager;

import android.hardware.usb.IUsbManager;

import android.hardware.usb.UsbManager;

import android.healthconnect.HealthServicesInitializer;

import android.health.connect.HealthServicesInitializer;

import android.location.CountryDetector;

import android.location.ICountryDetector;

import android.location.ILocationManager;

core/java/android/content/Context.java

+2 −2
Original line number Diff line number Diff line
@@ -6151,10 +6151,10 @@ public abstract class Context { 


    /**

     * Use with {@link #getSystemService(String)} to retrieve a

     * {@link android.healthconnect.HealthConnectManager}.

     * {@link android.health.connect.HealthConnectManager}.

     *

     * @see #getSystemService(String)

     * @see android.healthconnect.HealthConnectManager

     * @see android.health.connect.HealthConnectManager

     */

    public static final String HEALTHCONNECT_SERVICE = "healthconnect";

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ import android.content.pm.ParceledListSlice; 
import android.content.pm.PermissionGroupInfo;

import android.content.pm.PermissionInfo;

import android.content.pm.permission.SplitPermissionInfoParcelable;

import android.healthconnect.HealthConnectManager;

import android.health.connect.HealthConnectManager;

import android.os.Binder;

import android.os.IBinder;

import android.os.Process;