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

Commit 59640ab7 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Remove product_is_iot. am: 917bb01c 

am: 8f163dd2

Change-Id: Ia9ae688bf593b824b6aab721b510c4d210c28b73
parents 0df92a4a 8f163dd2

media/utils/Android.bp

+0 −6
Original line number Diff line number Diff line
@@ -45,12 +45,6 @@ cc_library { 
        "-Werror",

    ],



    product_variables: {

        product_is_iot: {

            cflags: ["-DTARGET_ANDROID_THINGS"],

        },

    },



    include_dirs: [

        // For android_mallopt definitions.

        "bionic/libc/private"

media/utils/ServiceUtilities.cpp

+0 −11
Original line number Diff line number Diff line
@@ -176,18 +176,7 @@ bool modifyDefaultAudioEffectsAllowed() { 
    // IMPORTANT: Use PermissionCache - not a runtime permission and may not change.

    bool ok = PermissionCache::checkCallingPermission(sModifyDefaultAudioEffectsAllowed);



#ifdef TARGET_ANDROID_THINGS

    if (!ok) {

        // Use a secondary permission on Android Things to allow a more lenient level of protection.

        static const String16 sModifyDefaultAudioEffectsAndroidThingsAllowed(

                "com.google.android.things.permission.MODIFY_DEFAULT_AUDIO_EFFECTS");

        ok = PermissionCache::checkCallingPermission(

                sModifyDefaultAudioEffectsAndroidThingsAllowed);

    }

    if (!ok) ALOGE("com.google.android.things.permission.MODIFY_DEFAULT_AUDIO_EFFECTS");

#else

    if (!ok) ALOGE("android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS");

#endif

    return ok;

}