Merge "Stop AndroidFrameworkContextUserId on UserManager"

This commit is contained in:
Adam Bookatz
2023-02-07 19:31:09 +00:00
committed by Android (Google) Code Review
2 changed files with 29 additions and 0 deletions

View File

@@ -68,6 +68,8 @@ public final class ContextUserIdChecker extends BugChecker implements MethodInvo
.named("myUserId"),
instanceMethod().onExactClass("android.content.pm.ShortcutManager")
.named("injectMyUserId"),
instanceMethod().onExactClass("android.os.UserManager")
.named("getContextUserIfAppropriate"),
instanceMethod().onDescendantOf("android.content.Context")
.named("getUserId")));

View File

@@ -148,4 +148,31 @@ public class ContextUserIdCheckerTest {
"}")
.doTest();
}
@Test
public void testUserManager() {
compilationHelper
.addSourceFile("/android/annotation/SystemService.java")
.addSourceFile("/android/content/Context.java")
.addSourceFile("/android/content/Intent.java")
.addSourceFile("/android/foo/IFooService.java")
.addSourceFile("/android/os/IInterface.java")
.addSourceFile("/android/os/UserHandle.java")
.addSourceFile("/android/os/RemoteException.java")
.addSourceLines("UserManager.java",
"package android.os;",
"import android.annotation.SystemService;",
"import android.content.Context;",
"import android.foo.IFooService;",
"import android.os.UserHandle;",
"import android.os.RemoteException;",
"@SystemService(\"user\") public class UserManager {",
" IFooService mService;",
" int getContextUserIfAppropriate() { return 0; }",
" void bar() throws RemoteException {",
" mService.baz(null, getContextUserIfAppropriate());",
" }",
"}")
.doTest();
}
}