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

Commit c894a900 authored by Seigo Nonaka's avatar Seigo Nonaka Committed by Android (Google) Code Review
Browse files

Merge "Rethrow RemoteException and mark @NonNull to getFontConfig()" into sc-dev

parents 84e45dc6 19ae151a
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -2878,7 +2878,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);
+1 −1
Original line number Diff line number Diff line
@@ -861,7 +861,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);
+2 −5
Original line number Diff line number Diff line
@@ -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();
        }
    }