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

Commit 97e89c62 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Update DPM.getWifiMacAddress to take admin component as argument." into nyc-dev

parents b27f3282 3cb4da16

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -5885,7 +5885,7 @@ package android.app.admin { 
    method public android.app.admin.SystemUpdatePolicy getSystemUpdatePolicy();

    method public java.util.List<android.os.PersistableBundle> getTrustAgentConfiguration(android.content.ComponentName, android.content.ComponentName);

    method public android.os.Bundle getUserRestrictions(android.content.ComponentName);

    method public java.lang.String getWifiMacAddress();

    method public java.lang.String getWifiMacAddress(android.content.ComponentName);

    method public boolean hasCaCertInstalled(android.content.ComponentName, byte[]);

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

    method public boolean installCaCert(android.content.ComponentName, byte[]);

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -6031,7 +6031,7 @@ package android.app.admin { 
    method public java.util.List<android.os.PersistableBundle> getTrustAgentConfiguration(android.content.ComponentName, android.content.ComponentName);

    method public int getUserProvisioningState();

    method public android.os.Bundle getUserRestrictions(android.content.ComponentName);

    method public java.lang.String getWifiMacAddress();

    method public java.lang.String getWifiMacAddress(android.content.ComponentName);

    method public boolean hasCaCertInstalled(android.content.ComponentName, byte[]);

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

    method public boolean installCaCert(android.content.ComponentName, byte[]);

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -5889,7 +5889,7 @@ package android.app.admin { 
    method public android.app.admin.SystemUpdatePolicy getSystemUpdatePolicy();

    method public java.util.List<android.os.PersistableBundle> getTrustAgentConfiguration(android.content.ComponentName, android.content.ComponentName);

    method public android.os.Bundle getUserRestrictions(android.content.ComponentName);

    method public java.lang.String getWifiMacAddress();

    method public java.lang.String getWifiMacAddress(android.content.ComponentName);

    method public boolean hasCaCertInstalled(android.content.ComponentName, byte[]);

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

    method public boolean installCaCert(android.content.ComponentName, byte[]);

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

+3 −2
Original line number Diff line number Diff line
@@ -5542,14 +5542,15 @@ public class DevicePolicyManager { 
    /**

     * Called by device owner to get the MAC address of the Wi-Fi device.

     *

     * @param admin Which device owner this request is associated with.

     * @return the MAC address of the Wi-Fi device, or null when the information is not

     * available. (For example, Wi-Fi hasn't been enabled, or the device doesn't support Wi-Fi.)

     *

     * <p>The address will be in the {@code XX:XX:XX:XX:XX:XX} format.

     */

    public String getWifiMacAddress() {

    public String getWifiMacAddress(@NonNull ComponentName admin) {

        try {

            return mService.getWifiMacAddress();

            return mService.getWifiMacAddress(admin);

        } catch (RemoteException re) {

            throw re.rethrowFromSystemServer();

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ interface IDevicePolicyManager { 
    List<String> getKeepUninstalledPackages(in ComponentName admin);

    boolean isManagedProfile(in ComponentName admin);

    boolean isSystemOnlyUser(in ComponentName admin);

    String getWifiMacAddress();

    String getWifiMacAddress(in ComponentName admin);

    void reboot(in ComponentName admin);



    void setShortSupportMessage(in ComponentName admin, in String message);