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

Merge "Parse empty component permissions as null"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-01-07 02:06:09 +00:00
committed by Android (Google) Code Review
parent 5a99ba031e 7ef452c6dc
commit ae70e4d9d3
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/content/pm/parsing/ComponentParseUtils.java
View File

@@ -465,7 +465,8 @@ public class ComponentParseUtils {
}
public void setPermission(String permission) {
this.permission = TextUtils.safeIntern(permission);
// Empty string must be converted to null
this.permission = TextUtils.isEmpty(permission) ? null : permission.intern();
}
public String getPermission() {
@@ -842,7 +843,9 @@ public class ComponentParseUtils {
}
public void setReadPermission(String readPermission) {
this.readPermission = TextUtils.safeIntern(readPermission);
// Empty string must be converted to null
this.readPermission = TextUtils.isEmpty(readPermission)
? null : readPermission.intern();
}
public String getReadPermission() {
@@ -850,7 +853,9 @@ public class ComponentParseUtils {
}
public void setWritePermission(String writePermission) {
this.writePermission = TextUtils.safeIntern(writePermission);
// Empty string must be converted to null
this.writePermission = TextUtils.isEmpty(writePermission)
? null : writePermission.intern();
}
public String getWritePermission() {