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

Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions" am: 9c59242102 am: e23884eed9 am: f21625fe80

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2003011

Change-Id: I6e850608c5454ce80562a956074bc9ebe5c1597d
This commit is contained in:
Colin Cross
2022-03-02 00:55:39 +00:00
committed by Automerger Merge Worker
parent f886179845 f21625fe80
commit 54a9fd4e17
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/robotests/src/com/android/settings/system/SystemUpdatePreferenceControllerTest.java
View File

@@ -139,7 +139,7 @@ public class SystemUpdatePreferenceControllerTest {
assertThat(mPreference.getSummary())
.isEqualTo(mContext.getString(R.string.android_version_summary,
Build.VERSION.RELEASE_OR_CODENAME));
Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY));
}
@Test
@@ -168,4 +168,4 @@ public class SystemUpdatePreferenceControllerTest {
assertThat(mPreference.getSummary())
.isEqualTo(mContext.getString(R.string.android_version_pending_update_summary));
}
}
}