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

Commit 7ef452c6 authored by Winson's avatar Winson
Browse files

Parse empty component permissions as null 

An empty string is a valid value, and must be converted to null so
that the permission check is skipped.

Bug: 146596667

Test: manual verify failure using APK from bug, success after fix

Change-Id: Ia5cc915124a6ecb7ec6a9c907b5f2afed98cd44e
parent ef75672d

core/java/android/content/pm/parsing/ComponentParseUtils.java

+8 −3
Original line number Diff line number Diff line
@@ -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() {