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

Revert "Rmove @UnsupportedAppUsage"

Browse Source 
This reverts commit 351df0901d.

Bug: 146181012
Bug: 145986883
Bug: 146318594
Bug: 146316215
Bug: 146315595

Reason for revert: This changed caused APP crash.
Change-Id: I0a1863176bf80ba5ad044621b5a2ff72e0d57fa4
This commit is contained in:
Haoyu Zhang
2019-12-16 21:46:58 +00:00
parent 351df0901d
commit fe7b206c8d
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
graphics/java/android/graphics/FontFamily.java
View File

@@ -17,6 +17,7 @@
package android.graphics;
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.content.res.AssetManager;
import android.graphics.fonts.FontVariationAxis;
import android.text.TextUtils;
@@ -57,6 +58,7 @@ public class FontFamily {
*
* This cannot be deleted because it's in use by AndroidX.
*/
@UnsupportedAppUsage(trackingBug = 123768928)
public long mNativePtr;
// Points native font family builder. Must be zero after freezing this family.
@@ -65,6 +67,7 @@ public class FontFamily {
/**
* This cannot be deleted because it's in use by AndroidX.
*/
@UnsupportedAppUsage(trackingBug = 123768928)
public FontFamily() {
mBuilderPtr = nInitBuilder(null, 0);
mNativeBuilderCleaner = sBuilderRegistry.registerNativeAllocation(this, mBuilderPtr);
@@ -73,6 +76,7 @@ public class FontFamily {
/**
* This cannot be deleted because it's in use by AndroidX.
*/
@UnsupportedAppUsage(trackingBug = 123768928)
public FontFamily(@Nullable String[] langs, int variant) {
final String langsString;
if (langs == null || langs.length == 0) {
@@ -94,6 +98,7 @@ public class FontFamily {
*
* This cannot be deleted because it's in use by AndroidX.
*/
@UnsupportedAppUsage(trackingBug = 123768928)
public boolean freeze() {
if (mBuilderPtr == 0) {
throw new IllegalStateException("This FontFamily is already frozen");
@@ -110,6 +115,7 @@ public class FontFamily {
/**
* This cannot be deleted because it's in use by AndroidX.
*/
@UnsupportedAppUsage(trackingBug = 123768928)
public void abortCreation() {
if (mBuilderPtr == 0) {
throw new IllegalStateException("This FontFamily is already frozen or abandoned");
@@ -121,6 +127,7 @@ public class FontFamily {
/**
* This cannot be deleted because it's in use by AndroidX.
*/
@UnsupportedAppUsage(trackingBug = 123768928)
public boolean addFont(String path, int ttcIndex, FontVariationAxis[] axes, int weight,
int italic) {
if (mBuilderPtr == 0) {
@@ -144,6 +151,7 @@ public class FontFamily {
/**
* This cannot be deleted because it's in use by AndroidX.
*/
@UnsupportedAppUsage(trackingBug = 123768928)
public boolean addFontFromBuffer(ByteBuffer font, int ttcIndex, FontVariationAxis[] axes,
int weight, int italic) {
if (mBuilderPtr == 0) {
@@ -171,6 +179,7 @@ public class FontFamily {
*
* This cannot be deleted because it's in use by AndroidX.
*/
@UnsupportedAppUsage(trackingBug = 123768928)
public boolean addFontFromAssetManager(AssetManager mgr, String path, int cookie,
boolean isAsset, int ttcIndex, int weight, int isItalic,
FontVariationAxis[] axes) {