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

Commit 47af53ed authored by Benjamin Franz's avatar Benjamin Franz Committed by Android (Google) Code Review
Browse files

Merge "Introduce device owner API to disable the status bar"

parents 560a8338 ea2ec97f

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5740,6 +5740,7 @@ package android.app.admin { 
    method public void setRestrictionsProvider(android.content.ComponentName, android.content.ComponentName);

    method public void setScreenCaptureDisabled(android.content.ComponentName, boolean);

    method public void setSecureSetting(android.content.ComponentName, java.lang.String, java.lang.String);

    method public void setStatusBarEnabledState(android.content.ComponentName, boolean);

    method public int setStorageEncryption(android.content.ComponentName, boolean);

    method public void setTrustAgentConfiguration(android.content.ComponentName, android.content.ComponentName, android.os.PersistableBundle);

    method public void setUninstallBlocked(android.content.ComponentName, java.lang.String, boolean);

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5844,6 +5844,7 @@ package android.app.admin { 
    method public void setRestrictionsProvider(android.content.ComponentName, android.content.ComponentName);

    method public void setScreenCaptureDisabled(android.content.ComponentName, boolean);

    method public void setSecureSetting(android.content.ComponentName, java.lang.String, java.lang.String);

    method public void setStatusBarEnabledState(android.content.ComponentName, boolean);

    method public int setStorageEncryption(android.content.ComponentName, boolean);

    method public void setTrustAgentConfiguration(android.content.ComponentName, android.content.ComponentName, android.os.PersistableBundle);

    method public void setUninstallBlocked(android.content.ComponentName, java.lang.String, boolean);

core/java/android/app/admin/DevicePolicyManager.java

+16 −0
Original line number Diff line number Diff line
@@ -4210,4 +4210,20 @@ public class DevicePolicyManager { 
            return false;

        }

    }



    /**

     * Called by device owner to set the enabled state of the status bar. Disabling the status

     * bar blocks notifications, quick settings and other screen overlays that allow escaping from

     * a single use device.

     *

     * @param admin Which {@link DeviceAdminReceiver} this request is associated with.

     * @param enabled New state of the status bar.

     */

    public void setStatusBarEnabledState(ComponentName admin, boolean enabled) {

        try {

            mService.setStatusBarEnabledState(admin, enabled);

        } catch (RemoteException re) {

            Log.w(TAG, "Failed talking with device policy service", re);

        }

    }

}

core/java/android/app/admin/IDevicePolicyManager.aidl

+1 −0
Original line number Diff line number Diff line
@@ -223,4 +223,5 @@ interface IDevicePolicyManager { 
    PersistableBundle getOtaPolicy();



    boolean setKeyguardEnabledState(in ComponentName admin, boolean enabled);

    void setStatusBarEnabledState(in ComponentName who, boolean enabled);

}

core/java/com/android/internal/statusbar/IStatusBarService.aidl

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ interface IStatusBarService 
    void expandNotificationsPanel();

    void collapsePanels();

    void disable(int what, IBinder token, String pkg);

    void disableForUser(int what, IBinder token, String pkg, int userId);

    void setIcon(String slot, String iconPackage, int iconId, int iconLevel, String contentDescription);

    void setIconVisibility(String slot, boolean visible);

    void removeIcon(String slot);