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

Commit 271e9454 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Only resolve users on content:// Uris. 

Otherwise we'd try doing weird things like parsing email addresses
as user numbers and NumberFormatException.

Test: none
Bug: 74004408
Change-Id: I1d0dd77db0abf3e8888e96e3c1cd2c24b54be05f
parent b133cbfd

services/core/java/com/android/server/am/ActivityManagerService.java

+6 −2
Original line number Diff line number Diff line
@@ -1261,8 +1261,12 @@ public class ActivityManagerService extends IActivityManager.Stub 
        }















        public static GrantUri resolve(int defaultSourceUserHandle, Uri uri) {













            if (ContentResolver.SCHEME_CONTENT.equals(uri.getScheme())) {















                return new GrantUri(ContentProvider.getUserIdFromUri(uri, defaultSourceUserHandle),















                        ContentProvider.getUriWithoutUserId(uri), false);













            } else {













                return new GrantUri(defaultSourceUserHandle, uri, false);













            }















        }















    }