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

Commit a30095d9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't allow reflection on ViewConfiguration#sHasPermanentMenuKey."

parents 46454b95 471709ae

core/java/android/view/ViewConfiguration.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ import android.content.Context; 
import android.content.res.Configuration;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.content.res.Resources;

import android.graphics.Point;

import android.graphics.Point;

import android.os.Build;

import android.os.RemoteException;

import android.os.RemoteException;

import android.provider.Settings;

import android.provider.Settings;

import android.util.DisplayMetrics;

import android.util.DisplayMetrics;
@@ -314,7 +315,7 @@ public class ViewConfiguration { 
    private final float mHorizontalScrollFactor;

    private final float mHorizontalScrollFactor;

    private final boolean mShowMenuShortcutsWhenKeyboardPresent;

    private final boolean mShowMenuShortcutsWhenKeyboardPresent;





    @UnsupportedAppUsage

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 123768915)

    private boolean sHasPermanentMenuKey;

    private boolean sHasPermanentMenuKey;

    @UnsupportedAppUsage

    @UnsupportedAppUsage

    private boolean sHasPermanentMenuKeySet;

    private boolean sHasPermanentMenuKeySet;