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

Commit ffeef152 authored by Adam Bookatz's avatar Adam Bookatz Committed by Android (Google) Code Review
Browse files

Merge "Stop AndroidFrameworkContextUserId on UserManager"

parents 913336a2 c80cb2eb

errorprone/java/com/google/errorprone/bugpatterns/android/ContextUserIdChecker.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -68,6 +68,8 @@ public final class ContextUserIdChecker extends BugChecker implements MethodInvo 
                    .named("myUserId"),

                    .named("myUserId"),

            instanceMethod().onExactClass("android.content.pm.ShortcutManager")

            instanceMethod().onExactClass("android.content.pm.ShortcutManager")

                    .named("injectMyUserId"),

                    .named("injectMyUserId"),

            instanceMethod().onExactClass("android.os.UserManager")

                    .named("getContextUserIfAppropriate"),

            instanceMethod().onDescendantOf("android.content.Context")

            instanceMethod().onDescendantOf("android.content.Context")

                    .named("getUserId")));

                    .named("getUserId")));

errorprone/tests/java/com/google/errorprone/bugpatterns/android/ContextUserIdCheckerTest.java

+27 −0
Original line number Original line Diff line number Diff line
@@ -148,4 +148,31 @@ public class ContextUserIdCheckerTest { 
                        "}")

                        "}")

                .doTest();

                .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();

    }

}
 
}