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

Commit 4c06b8fe authored by Rubin Xu's avatar Rubin Xu Committed by Android (Google) Code Review
Browse files

Merge "Address API feedback on theft detection API" into main

parents 0724fa11 8b1a4d04

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -198,7 +198,6 @@ package android { 
    field public static final String MANAGE_DEVICE_ADMINS = "android.permission.MANAGE_DEVICE_ADMINS";

    field public static final String MANAGE_DEVICE_POLICY_APP_EXEMPTIONS = "android.permission.MANAGE_DEVICE_POLICY_APP_EXEMPTIONS";

    field @FlaggedApi("android.app.admin.flags.security_log_v2_enabled") public static final String MANAGE_DEVICE_POLICY_AUDIT_LOGGING = "android.permission.MANAGE_DEVICE_POLICY_AUDIT_LOGGING";

    field @FlaggedApi("android.app.admin.flags.device_theft_api_enabled") public static final String MANAGE_DEVICE_POLICY_THEFT_DETECTION = "android.permission.MANAGE_DEVICE_POLICY_THEFT_DETECTION";

    field @FlaggedApi("android.permission.flags.enhanced_confirmation_mode_apis_enabled") public static final String MANAGE_ENHANCED_CONFIRMATION_STATES = "android.permission.MANAGE_ENHANCED_CONFIRMATION_STATES";

    field public static final String MANAGE_ETHERNET_NETWORKS = "android.permission.MANAGE_ETHERNET_NETWORKS";

    field public static final String MANAGE_FACTORY_RESET_PROTECTION = "android.permission.MANAGE_FACTORY_RESET_PROTECTION";
@@ -282,6 +281,7 @@ package android { 
    field @FlaggedApi("android.content.pm.quarantined_enabled") public static final String QUARANTINE_APPS = "android.permission.QUARANTINE_APPS";

    field public static final String QUERY_ADMIN_POLICY = "android.permission.QUERY_ADMIN_POLICY";

    field public static final String QUERY_CLONED_APPS = "android.permission.QUERY_CLONED_APPS";

    field @FlaggedApi("android.app.admin.flags.device_theft_api_enabled") public static final String QUERY_DEVICE_STOLEN_STATE = "android.permission.QUERY_DEVICE_STOLEN_STATE";

    field @Deprecated public static final String QUERY_TIME_ZONE_RULES = "android.permission.QUERY_TIME_ZONE_RULES";

    field public static final String QUERY_USERS = "android.permission.QUERY_USERS";

    field public static final String RADIO_SCAN_WITHOUT_LOCATION = "android.permission.RADIO_SCAN_WITHOUT_LOCATION";
@@ -1328,12 +1328,12 @@ package android.app.admin { 
    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS}) public int getUserProvisioningState();

    method @FlaggedApi("android.app.admin.flags.security_log_v2_enabled") @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_POLICY_AUDIT_LOGGING) public boolean isAuditLogEnabled();

    method public boolean isDeviceManaged();

    method @FlaggedApi("android.app.admin.flags.device_theft_api_enabled") @RequiresPermission(android.Manifest.permission.QUERY_DEVICE_STOLEN_STATE) public boolean isDevicePotentiallyStolen();

    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isDeviceProvisioned();

    method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isDeviceProvisioningConfigApplied();

    method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public boolean isDpcDownloaded();

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS}) public boolean isManagedKiosk();

    method public boolean isSecondaryLockscreenEnabled(@NonNull android.os.UserHandle);

    method @FlaggedApi("android.app.admin.flags.device_theft_api_enabled") @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_POLICY_THEFT_DETECTION) public boolean isTheftDetectionTriggered();

    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS}) public boolean isUnattendedManagedKiosk();

    method @RequiresPermission("android.permission.NOTIFY_PENDING_SYSTEM_UPDATE") public void notifyPendingSystemUpdate(long);

    method @RequiresPermission("android.permission.NOTIFY_PENDING_SYSTEM_UPDATE") public void notifyPendingSystemUpdate(long, boolean);

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

+5 −5
Original line number Diff line number Diff line
@@ -45,11 +45,11 @@ import static android.Manifest.permission.MANAGE_DEVICE_POLICY_SECURITY_LOGGING; 
import static android.Manifest.permission.MANAGE_DEVICE_POLICY_STATUS_BAR;

import static android.Manifest.permission.MANAGE_DEVICE_POLICY_SUPPORT_MESSAGE;

import static android.Manifest.permission.MANAGE_DEVICE_POLICY_SYSTEM_UPDATES;

import static android.Manifest.permission.MANAGE_DEVICE_POLICY_THEFT_DETECTION;

import static android.Manifest.permission.MANAGE_DEVICE_POLICY_USB_DATA_SIGNALLING;

import static android.Manifest.permission.MANAGE_DEVICE_POLICY_WIFI;

import static android.Manifest.permission.MANAGE_DEVICE_POLICY_WIPE_DATA;

import static android.Manifest.permission.QUERY_ADMIN_POLICY;

import static android.Manifest.permission.QUERY_DEVICE_STOLEN_STATE;

import static android.Manifest.permission.REQUEST_PASSWORD_COMPLEXITY;

import static android.Manifest.permission.SET_TIME;

import static android.Manifest.permission.SET_TIME_ZONE;
@@ -17152,15 +17152,15 @@ public class DevicePolicyManager { 
     * @hide

     */

    @SystemApi

    @RequiresPermission(value = MANAGE_DEVICE_POLICY_THEFT_DETECTION)

    @RequiresPermission(value = QUERY_DEVICE_STOLEN_STATE)

    @FlaggedApi(FLAG_DEVICE_THEFT_API_ENABLED)

    public boolean isTheftDetectionTriggered() {

        throwIfParentInstance("isTheftDetectionTriggered");

    public boolean isDevicePotentiallyStolen() {

        throwIfParentInstance("isDevicePotentiallyStolen");

        if (mService == null) {

            return false;

        }

        try {

            return mService.isTheftDetectionTriggered(mContext.getPackageName());

            return mService.isDevicePotentiallyStolen(mContext.getPackageName());

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -581,7 +581,7 @@ interface IDevicePolicyManager { 
    void setWifiSsidPolicy(String callerPackageName, in WifiSsidPolicy policy);

    WifiSsidPolicy getWifiSsidPolicy(String callerPackageName);



    boolean isTheftDetectionTriggered(String callerPackageName);

    boolean isDevicePotentiallyStolen(String callerPackageName);



    List<UserHandle> listForegroundAffiliatedUsers();

    void setDrawables(in List<DevicePolicyDrawableResource> drawables);

core/res/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -3801,12 +3801,12 @@ 
    <permission android:name="android.permission.MANAGE_DEVICE_POLICY_LOCK"

                android:protectionLevel="internal|role" />



    <!-- Allows an application to manage policy related to theft detection.

    <!-- Allows an application to query the device stolen state.

        @FlaggedApi("android.app.admin.flags.device_theft_api_enabled")

        @hide

        @SystemApi

    -->

    <permission android:name="android.permission.MANAGE_DEVICE_POLICY_THEFT_DETECTION"

    <permission android:name="android.permission.QUERY_DEVICE_STOLEN_STATE"

                android:protectionLevel="internal|role" />



    <!-- Allows an application to manage policy related to system apps.

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+3 −3
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ import static android.Manifest.permission.MANAGE_DEVICE_POLICY_STATUS_BAR; 
import static android.Manifest.permission.MANAGE_DEVICE_POLICY_SUPPORT_MESSAGE;

import static android.Manifest.permission.MANAGE_DEVICE_POLICY_SYSTEM_DIALOGS;

import static android.Manifest.permission.MANAGE_DEVICE_POLICY_SYSTEM_UPDATES;

import static android.Manifest.permission.MANAGE_DEVICE_POLICY_THEFT_DETECTION;

import static android.Manifest.permission.MANAGE_DEVICE_POLICY_THREAD_NETWORK;

import static android.Manifest.permission.MANAGE_DEVICE_POLICY_TIME;

import static android.Manifest.permission.MANAGE_DEVICE_POLICY_USB_DATA_SIGNALLING;
@@ -93,6 +92,7 @@ import static android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS; 
import static android.Manifest.permission.MASTER_CLEAR;

import static android.Manifest.permission.NOTIFY_PENDING_SYSTEM_UPDATE;

import static android.Manifest.permission.QUERY_ADMIN_POLICY;

import static android.Manifest.permission.QUERY_DEVICE_STOLEN_STATE;

import static android.Manifest.permission.REQUEST_PASSWORD_COMPLEXITY;

import static android.Manifest.permission.SET_TIME;

import static android.Manifest.permission.SET_TIME_ZONE;
@@ -22128,12 +22128,12 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
    }















    @Override













    public boolean isTheftDetectionTriggered(String callerPackageName) {













    public boolean isDevicePotentiallyStolen(String callerPackageName) {















        final CallerIdentity caller = getCallerIdentity(callerPackageName);















        if (!android.app.admin.flags.Flags.deviceTheftImplEnabled()) {















            return false;















        }













        enforcePermission(MANAGE_DEVICE_POLICY_THEFT_DETECTION, caller.getPackageName(),













        enforcePermission(QUERY_DEVICE_STOLEN_STATE, caller.getPackageName(),















                caller.getUserId());





























        return mInjector.binderWithCleanCallingIdentity(() ->