Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rethrow RemoteException and mark @NonNull to getFontConfig()

Browse Source 
Bug: 180395483
Test: N/A
Change-Id: I63d39c8f2f111fd30860e7ee8287b199b6796a66
This commit is contained in:
Seigo Nonaka
2021-02-25 14:11:40 -08:00
parent 5c9a0355f8
commit 19ae151a8e
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -2874,7 +2874,7 @@ package android.graphics.fonts {
}
public class FontManager {
method @Nullable public android.text.FontConfig getFontConfig();
method @NonNull public android.text.FontConfig getFontConfig();
method @RequiresPermission(android.Manifest.permission.UPDATE_FONTS) public int updateFontFamily(@NonNull android.graphics.fonts.FontFamilyUpdateRequest, @IntRange(from=0) int);
method @RequiresPermission(android.Manifest.permission.UPDATE_FONTS) public int updateFontFile(@NonNull android.graphics.fonts.FontFileUpdateRequest, @IntRange(from=0) int);
method @Deprecated @RequiresPermission(android.Manifest.permission.UPDATE_FONTS) public int updateFontFile(@NonNull android.os.ParcelFileDescriptor, @NonNull byte[], @IntRange(from=0) int);

2
core/api/test-current.txt
View File

@@ -845,7 +845,7 @@ package android.graphics.drawable {
package android.graphics.fonts {
public class FontManager {
method @Nullable public android.text.FontConfig getFontConfig();
method @NonNull public android.text.FontConfig getFontConfig();
method @RequiresPermission(android.Manifest.permission.UPDATE_FONTS) public int updateFontFamily(@NonNull android.graphics.fonts.FontFamilyUpdateRequest, @IntRange(from=0) int);
method @RequiresPermission(android.Manifest.permission.UPDATE_FONTS) public int updateFontFile(@NonNull android.graphics.fonts.FontFileUpdateRequest, @IntRange(from=0) int);
method @Deprecated @RequiresPermission(android.Manifest.permission.UPDATE_FONTS) public int updateFontFile(@NonNull android.os.ParcelFileDescriptor, @NonNull byte[], @IntRange(from=0) int);

7
core/java/android/graphics/fonts/FontManager.java
View File

@@ -20,7 +20,6 @@ import android.Manifest;
import android.annotation.IntDef;
import android.annotation.IntRange;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.RequiresPermission;
import android.annotation.SystemApi;
import android.annotation.SystemService;
@@ -29,7 +28,6 @@ import android.content.Context;
import android.os.ParcelFileDescriptor;
import android.os.RemoteException;
import android.text.FontConfig;
import android.util.Log;
import com.android.internal.graphics.fonts.IFontManager;
@@ -198,12 +196,11 @@ public class FontManager {
* @return The current font configuration. null if failed to fetch information from the system
* service.
*/
public @Nullable FontConfig getFontConfig() {
public @NonNull FontConfig getFontConfig() {
try {
return mIFontManager.getFontConfig();
} catch (RemoteException e) {
Log.e(TAG, "Failed to call getFontConfig", e);
return null;
throw e.rethrowAsRuntimeException();
}
}