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

Commit b2ceafab authored by juquan's avatar juquan
Browse files

[Device Supervision] Add AOSP metrics for change PIN action. 

Bug: 415101622
Flag: android.app.supervision.flags.enable_supervision_settings_screen
Test: atest SupervisionCredentialProxyActivityTest
Change-Id: Ia488c6d57d0352155ba3e400bb8a1a5128a0d769
parent ffd45878

src/com/android/settings/supervision/SupervisionChangePinPreference.kt

+8 −3
Original line number Diff line number Diff line
@@ -15,18 +15,20 @@ 
 */

package com.android.settings.supervision



import android.app.settings.SettingsEnums.ACTION_SUPERVISION_CHANGE_PIN

import android.content.Context

import android.content.Intent

import android.util.Log

import com.android.settings.R

import com.android.settings.metrics.PreferenceActionMetricsProvider

import com.android.settingslib.metadata.PreferenceMetadata

import com.android.settingslib.supervision.SupervisionLog

import com.android.settingslib.supervision.SupervisionLog.TAG



/**

 * Setting on PIN Management screen (Settings > Supervision > Manage Pin) that invokes the flow to

 * update the existing device supervision PIN.

 */

class SupervisionChangePinPreference : PreferenceMetadata {

class SupervisionChangePinPreference : PreferenceMetadata, PreferenceActionMetricsProvider {



    override val key: String

        get() = KEY
@@ -34,9 +36,12 @@ class SupervisionChangePinPreference : PreferenceMetadata { 
    override val title: Int

        get() = R.string.supervision_change_pin_preference_title



    override val preferenceActionMetrics: Int

        get() = ACTION_SUPERVISION_CHANGE_PIN



    override fun intent(context: Context): Intent? {

        if (!context.isSupervisingCredentialSet) {

            Log.w(SupervisionLog.TAG, "Supervising credential not set")

            Log.w(TAG, "Supervising credential not set")

            return null

        }

src/com/android/settings/supervision/SupervisionCredentialProxyActivity.kt

+2 −1
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ open class SupervisionCredentialProxyActivity : FragmentActivity() { 
    }



    companion object {

        @VisibleForTesting const val REQUEST_CODE_SUPERVISION_CREDENTIALS_PROXY = 10

        @VisibleForTesting

        const val REQUEST_CODE_SUPERVISION_CREDENTIALS_PROXY = 10

    }

}

tests/robotests/src/com/android/settings/supervision/SupervisionCredentialProxyActivityTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ class SupervisionCredentialProxyActivityTest { 
    }



    @Test

    fun onCreate_supervisingUserNotNull_canStartProfile_startSetPinActivity() {

    fun onCreate_supervisingUser_canStartProfile_startSetPinActivity() {

        mockUserManager.stub { on { users } doReturn listOf(SUPERVISING_USER_INFO) }

        mockActivityManager.stub { on { startProfile(any()) } doReturn true }