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

Commit 6b365a84 authored by Ronish Kalia's avatar Ronish Kalia Committed by Android (Google) Code Review
Browse files

Merge "Rename healthconnect to healthfitness"

parents 5b839395 fc97db55

api/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ combined_apis { 
        "framework-connectivity-t",

        "framework-devicelock",

        "framework-graphics",

        "framework-healthconnect",

        "framework-healthfitness",

        "framework-media",

        "framework-mediaprovider",

        "framework-ondevicepersonalization",
@@ -119,7 +119,7 @@ combined_apis { 
    system_server_classpath: [

        "service-art",

        "service-configinfrastructure",

        "service-healthconnect",

        "service-healthfitness",

        "service-media-s",

        "service-permission",

        "service-rkp",

boot/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ custom_platform_bootclasspath { 
            module: "com.android.devicelock-bootclasspath-fragment",

        },

        {

            apex: "com.android.healthconnect",

            module: "com.android.healthconnect-bootclasspath-fragment",

            apex: "com.android.healthfitness",

            module: "com.android.healthfitness-bootclasspath-fragment",

        },

        {

            apex: "com.android.i18n",

packages/SettingsLib/ActivityEmbedding/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -30,6 +30,6 @@ android_library { 
    apex_available: [

        "//apex_available:platform",

        "com.android.permission",

        "com.android.healthconnect",

        "com.android.healthfitness",

    ],

}

packages/SettingsLib/AppPreference/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -23,6 +23,6 @@ android_library { 
    apex_available: [

        "//apex_available:platform",

        "com.android.permission",

        "com.android.healthconnect",

        "com.android.healthfitness",

    ],

}

packages/SettingsLib/CollapsingToolbarBaseActivity/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -28,6 +28,6 @@ android_library { 
        "com.android.adservices",

        "com.android.cellbroadcast",

        "com.android.permission",

        "com.android.healthconnect",

        "com.android.healthfitness",

    ],

}