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

Commit 99e6993d authored by Charles Chen's avatar Charles Chen Committed by Android (Google) Code Review
Browse files

Merge "Fix #getDisplay annotation" into main

parents 752dc9bf e13a2d8b

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -10405,7 +10405,7 @@ package android.content { 
    method public abstract java.io.File getDatabasePath(String);

    method public int getDeviceId();

    method public abstract java.io.File getDir(String, int);

    method @Nullable public android.view.Display getDisplay();

    method @NonNull public android.view.Display getDisplay();

    method @Nullable public final android.graphics.drawable.Drawable getDrawable(@DrawableRes int);

    method @Nullable public abstract java.io.File getExternalCacheDir();

    method public abstract java.io.File[] getExternalCacheDirs();

core/java/android/content/Context.java

+1 −1
Original line number Diff line number Diff line
@@ -7560,7 +7560,7 @@ public abstract class Context { 
     * @throws UnsupportedOperationException if the method is called on an instance that is not

     *         associated with any display.

     */

    @Nullable

    @NonNull

    public Display getDisplay() {

        throw new RuntimeException("Not implemented. Must override in a subclass.");

    }