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

Commit 418ba8f0 authored by Evan Laird's avatar Evan Laird
Browse files

Add @TestApi to StatusBarManager @SystemApi methods 

Enables CTS testing

Test: APIs are in api/test-current
Bug: 130178313
Change-Id: Ie408bc4399cf64018903ef122b8db1e6a9fa9fb1
parent 1c1c65ee

api/test-current.txt

+15 −0
Original line number Diff line number Diff line
@@ -345,6 +345,20 @@ package android.app { 
    method public android.graphics.Rect getSourceRectHint();

  }



  public class StatusBarManager {

    method @NonNull @RequiresPermission(android.Manifest.permission.STATUS_BAR) public android.app.StatusBarManager.DisableInfo getDisableInfo();

    method @RequiresPermission(android.Manifest.permission.STATUS_BAR) public void setDisabledForSetup(boolean);

  }



  public static final class StatusBarManager.DisableInfo {

    method public boolean areAllComponentsEnabled();

    method public boolean isNavigateToHomeDisabled();

    method public boolean isNotificationPeekingDisabled();

    method public boolean isRecentsDisabled();

    method public boolean isSearchDisabled();

    method public boolean isStatusBarExpansionDisabled();

  }



  public class TimePickerDialog extends android.app.AlertDialog implements android.content.DialogInterface.OnClickListener android.widget.TimePicker.OnTimeChangedListener {

    method public android.widget.TimePicker getTimePicker();

  }
@@ -629,6 +643,7 @@ package android.content { 
    method public void setContentCaptureOptions(@Nullable android.content.ContentCaptureOptions);

    field public static final String BUGREPORT_SERVICE = "bugreport";

    field public static final String ROLLBACK_SERVICE = "rollback";

    field public static final String STATUS_BAR_SERVICE = "statusbar";

    field public static final String TEST_NETWORK_SERVICE = "test_network";

  }

core/java/android/app/StatusBarManager.java

+10 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.annotation.Nullable; 
import android.annotation.RequiresPermission;

import android.annotation.SystemApi;

import android.annotation.SystemService;

import android.annotation.TestApi;

import android.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.os.Binder;
@@ -366,6 +367,7 @@ public class StatusBarManager { 
     * @hide

     */

    @SystemApi

    @TestApi

    @RequiresPermission(android.Manifest.permission.STATUS_BAR)

    public void setDisabledForSetup(boolean disabled) {

        try {
@@ -390,6 +392,7 @@ public class StatusBarManager { 
     * @hide

     */

    @SystemApi

    @TestApi

    @RequiresPermission(android.Manifest.permission.STATUS_BAR)

    @NonNull

    public DisableInfo getDisableInfo() {
@@ -422,6 +425,7 @@ public class StatusBarManager { 
     * @hide

     */

    @SystemApi

    @TestApi

    public static final class DisableInfo {



        private boolean mStatusBarExpansion;
@@ -448,6 +452,7 @@ public class StatusBarManager { 
         * @hide

         */

        @SystemApi

        @TestApi

        public boolean isStatusBarExpansionDisabled() {

            return mStatusBarExpansion;

        }
@@ -463,6 +468,7 @@ public class StatusBarManager { 
         * @hide

         */

        @SystemApi

        @TestApi

        public boolean isNavigateToHomeDisabled() {

            return mNavigateHome;

        }
@@ -478,6 +484,7 @@ public class StatusBarManager { 
         * @hide

         */

        @SystemApi

        @TestApi

        public boolean isNotificationPeekingDisabled() {

            return mNotificationPeeking;

        }
@@ -493,6 +500,7 @@ public class StatusBarManager { 
         * @hide

         */

        @SystemApi

        @TestApi

        public boolean isRecentsDisabled() {

            return mRecents;

        }
@@ -508,6 +516,7 @@ public class StatusBarManager { 
         * @hide

         */

        @SystemApi

        @TestApi

        public boolean isSearchDisabled() {

            return mSearch;

        }
@@ -523,6 +532,7 @@ public class StatusBarManager { 
         * @hide

         */

        @SystemApi

        @TestApi

        public boolean areAllComponentsEnabled() {

            return !mStatusBarExpansion && !mNavigateHome && !mNotificationPeeking && !mRecents

                    && !mSearch;

core/java/android/content/Context.java

+1 −0
Original line number Diff line number Diff line
@@ -3679,6 +3679,7 @@ public abstract class Context { 
     * @hide

     */

    @SystemApi

    @TestApi

    public static final String STATUS_BAR_SERVICE = "statusbar";



    /**