PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make the default getTimeSpentInApp() return empty"

Browse Source
This commit is contained in:
Chaohui Wang
2022-10-19 11:50:48 +00:00
committed by Android (Google) Code Review
parent c359630286 b752c3d058
commit cb7fa280f3
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/applications/ApplicationFeatureProvider.java
View File

@@ -19,6 +19,8 @@ package com.android.settings.applications;
import android.annotation.UserIdInt; import android.annotation.UserIdInt;
import android.content.Intent; import android.content.Intent;
import androidx.annotation.NonNull;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@@ -85,8 +87,9 @@ public interface ApplicationFeatureProvider {
* Returns a user readable text explaining how much time user has spent in an app at a * Returns a user readable text explaining how much time user has spent in an app at a
* pre-specified duration. * pre-specified duration.
*/ */
@NonNull
default CharSequence getTimeSpentInApp(String packageName) { default CharSequence getTimeSpentInApp(String packageName) {
return null; return "";
} }
/** /**

2
tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppTimeSpentPreferenceTest.kt
View File

@@ -35,13 +35,11 @@ import androidx.test.core.app.ApplicationProvider
import androidx.test.ext.junit.runners.AndroidJUnit4 import androidx.test.ext.junit.runners.AndroidJUnit4
import com.android.settings.R import com.android.settings.R
import com.android.settings.testutils.FakeFeatureFactory import com.android.settings.testutils.FakeFeatureFactory
import com.android.settingslib.spaprivileged.framework.common.storageStatsManager
import org.junit.Before import org.junit.Before
import org.junit.Rule import org.junit.Rule
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.mockito.Mock import org.mockito.Mock
import org.mockito.Mockito
import org.mockito.Mockito.any import org.mockito.Mockito.any
import org.mockito.Mockito.anyInt import org.mockito.Mockito.anyInt
import org.mockito.Spy import org.mockito.Spy