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

Commit 337e01ac authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

More work on issue #73301635: Ability to extract device configuration 

Now include Gl extensions (thanks to whoever wrote the code
I copied!).

Tweak the protos a bit to include missing info and correct
some things.

Add some new test APIs that are needed for CTS.

Bug: 73301635
Test: atest CtsActivityManagerDeviceTestCases:ActivityManagerGetConfigTests
Change-Id: Ie3f8173d217468246e8b6c7f45b7cbfcb352d60f
parent 008c4dbc

api/test-current.txt

+6 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ package android.app { 
  public class ActivityManager {

    method public void addOnUidImportanceListener(android.app.ActivityManager.OnUidImportanceListener, int);

    method public int getPackageImportance(java.lang.String);

    method public long getTotalRam();

    method public int getUidImportance(int);

    method public void removeOnUidImportanceListener(android.app.ActivityManager.OnUidImportanceListener);

    method public void removeStacksInWindowingModes(int[]) throws java.lang.SecurityException;
@@ -351,6 +352,7 @@ package android.hardware.display { 


  public final class DisplayManager {

    method public java.util.List<android.hardware.display.BrightnessChangeEvent> getBrightnessEvents();

    method public android.graphics.Point getStableDisplaySize();

    method public void setBrightnessConfiguration(android.hardware.display.BrightnessConfiguration);

  }
@@ -446,6 +448,10 @@ package android.net { 


package android.os {



  public static class Build.VERSION {

    field public static final int RESOURCES_SDK_INT;

  }



  public class IncidentManager {

    method public void reportIncident(android.os.IncidentReportArgs);

    method public void reportIncident(java.lang.String, byte[]);

core/java/android/app/ActivityManager.java

+12 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ import com.android.internal.app.procstats.ProcessStats; 
import com.android.internal.os.RoSystemProperties;

import com.android.internal.os.TransferPipe;

import com.android.internal.util.FastPrintWriter;

import com.android.internal.util.MemInfoReader;

import com.android.server.LocalServices;



import org.xmlpull.v1.XmlSerializer;
@@ -963,6 +964,17 @@ public class ActivityManager { 
                !Resources.getSystem().getBoolean(com.android.internal.R.bool.config_avoidGfxAccel);

    }



    /**

     * Return the total number of bytes of RAM this device has.

     * @hide

     */

    @TestApi

    public long getTotalRam() {

        MemInfoReader memreader = new MemInfoReader();

        memreader.readMemInfo();

        return memreader.getTotalSize();

    }



    /**

     * Return the maximum number of recents entries that we will maintain and show.

     * @hide

core/java/android/content/res/Configuration.java

+4 −6
Original line number Diff line number Diff line
@@ -16,10 +16,11 @@ 


package android.content.res;



import static android.content.ConfigurationProto.COLOR_MODE;

import static android.content.ConfigurationProto.DENSITY_DPI;

import static android.content.ConfigurationProto.FONT_SCALE;

import static android.content.ConfigurationProto.HARD_KEYBOARD_HIDDEN;

import static android.content.ConfigurationProto.HDR_COLOR_MODE;

import static android.content.ConfigurationProto.KEYBOARD;

import static android.content.ConfigurationProto.KEYBOARD_HIDDEN;

import static android.content.ConfigurationProto.LOCALES;

import static android.content.ConfigurationProto.MCC;
@@ -33,7 +34,6 @@ import static android.content.ConfigurationProto.SCREEN_WIDTH_DP; 
import static android.content.ConfigurationProto.SMALLEST_SCREEN_WIDTH_DP;

import static android.content.ConfigurationProto.TOUCHSCREEN;

import static android.content.ConfigurationProto.UI_MODE;

import static android.content.ConfigurationProto.WIDE_COLOR_GAMUT;

import static android.content.ConfigurationProto.WINDOW_CONFIGURATION;

import static android.content.ResourcesConfigurationProto.CONFIGURATION;

import static android.content.ResourcesConfigurationProto.SCREEN_HEIGHT_PX;
@@ -1095,11 +1095,9 @@ public final class Configuration implements Parcelable, Comparable<Configuration 
        protoOutputStream.write(MNC, mnc);

        mLocaleList.writeToProto(protoOutputStream, LOCALES);

        protoOutputStream.write(SCREEN_LAYOUT, screenLayout);

        protoOutputStream.write(HDR_COLOR_MODE,

                (colorMode & Configuration.COLOR_MODE_HDR_MASK) >> COLOR_MODE_HDR_SHIFT);

        protoOutputStream.write(WIDE_COLOR_GAMUT,

                colorMode & Configuration.COLOR_MODE_WIDE_COLOR_GAMUT_MASK);

        protoOutputStream.write(COLOR_MODE, colorMode);

        protoOutputStream.write(TOUCHSCREEN, touchscreen);

        protoOutputStream.write(KEYBOARD, keyboard);

        protoOutputStream.write(KEYBOARD_HIDDEN, keyboardHidden);

        protoOutputStream.write(HARD_KEYBOARD_HIDDEN, hardKeyboardHidden);

        protoOutputStream.write(NAVIGATION, navigation);

core/java/android/hardware/display/DisplayManager.java

+1 −0
Original line number Diff line number Diff line
@@ -615,6 +615,7 @@ public final class DisplayManager { 
     * @hide

     */

    @SystemApi

    @TestApi

    public Point getStableDisplaySize() {

        return mGlobal.getStableDisplaySize();

    }

core/java/android/os/Build.java

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.os; 
import android.Manifest;

import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.app.Application;

import android.content.Context;

import android.text.TextUtils;
@@ -287,6 +288,7 @@ public class Build { 
         * we are operating under, we bump the assumed resource platform version by 1.

         * @hide

         */

        @TestApi

        public static final int RESOURCES_SDK_INT = SDK_INT + ACTIVE_CODENAMES.length;



        /**