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

Commit f290f1c6 authored by David Duarte's avatar David Duarte Committed by Automerger Merge Worker
Browse files

Merge "Partially revert "Ignore incorrect NewApi Lint warning for... 

Merge "Partially revert "Ignore incorrect NewApi Lint warning for ENTERPRISE_CONTENT_URI"" into udc-dev am: ec3cd0ad

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/22721250



Change-Id: Ib57a192bf762d1351a3e37c6efccedaca6cddf4b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents befd5e19 ec3cd0ad

android/app/src/com/android/bluetooth/util/DevicePolicyUtils.java

+0 −3
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.bluetooth.util;



import android.annotation.SuppressLint;

import android.app.admin.DevicePolicyManager;

import android.content.Context;

import android.net.Uri;
@@ -48,8 +47,6 @@ public final class DevicePolicyUtils { 
     * and the policy allows, it will be a URI that supports the managed profile.

     */

    // TODO: Make primary profile can also support getBluetoothContactSharingDisabled()

    // TODO(b/193460475): Android Lint handles change from SystemApi to public incorrectly

    @SuppressLint("NewApi")

    public static Uri getEnterprisePhoneUri(Context context) {

        return isBluetoothWorkContactSharingDisabled(context) ? Phone.CONTENT_URI

                : Phone.ENTERPRISE_CONTENT_URI;