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

Commit 1d9bcaff authored by Steve Kondik's avatar Steve Kondik
Browse files

Misc compilation fixes 

Change-Id: If9dc820dc961e6419f91d15d4f138d8aeb71f2ca
parent 984794ae

cmds/bootanimation/BootAnimation.cpp

+3 −10
Original line number Diff line number Diff line
@@ -63,12 +63,6 @@ 


#include <private/regionalization/Environment.h>



#define OEM_BOOTANIMATION_FILE "/oem/media/bootanimation.zip"

#define SYSTEM_BOOTANIMATION_FILE "/system/media/bootanimation.zip"

#define SYSTEM_ENCRYPTED_BOOTANIMATION_FILE "/system/media/bootanimation-encrypted.zip"



#define EXIT_PROP_NAME "service.bootanim.exit"



namespace android {



static const char OEM_BOOTANIMATION_FILE[] = "/oem/media/bootanimation.zip";
@@ -1042,6 +1036,9 @@ bool BootAnimation::playAnimation(const Animation& animation) 
                break;

        }



        if (needSaveMem) {

            glDeleteTextures(1, &mTextureid);

        }

    }



    // Free textures created for looping parts now that the animation is done.
@@ -1053,10 +1050,6 @@ bool BootAnimation::playAnimation(const Animation& animation) 
                glDeleteTextures(1, &frame.tid);

            }

        }



        if (needSaveMem) {

            glDeleteTextures(1, &mTextureid);

        }

    }



    // we've finally played everything we're going to play

core/java/com/android/internal/util/cm/PowerMenuConstants.java

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.internal.util.cm; 
/* Master list of all actions for the power menu */

public class PowerMenuConstants {

    public static final String GLOBAL_ACTION_KEY_POWER = "power";

    public static final String GLOBAL_ACTION_KEY_REBOOT = "reboot";

    public static final String GLOBAL_ACTION_KEY_SCREENSHOT = "screenshot";

    public static final String GLOBAL_ACTION_KEY_AIRPLANE = "airplane";

    public static final String GLOBAL_ACTION_KEY_USERS = "users";
@@ -29,10 +28,11 @@ public class PowerMenuConstants { 
    public static final String GLOBAL_ACTION_KEY_SILENT = "silent";

    public static final String GLOBAL_ACTION_KEY_VOICEASSIST = "voiceassist";

    public static final String GLOBAL_ACTION_KEY_ASSIST = "assist";

    public static final String GLOBAL_ACTION_KEY_RESTART = "restart";



    private static String[] ALL_ACTIONS = {

        GLOBAL_ACTION_KEY_POWER,

        GLOBAL_ACTION_KEY_REBOOT,

        GLOBAL_ACTION_KEY_RESTART,

        GLOBAL_ACTION_KEY_SCREENSHOT,

        GLOBAL_ACTION_KEY_AIRPLANE,

        GLOBAL_ACTION_KEY_USERS,

core/java/com/android/internal/widget/LockPatternUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ public class LockPatternUtils { 
        throwIfCalledOnMainThread();

        try {

            VerifyCredentialResponse response =

                    getLockSettings().checkPattern(patternToString(pattern), userId,

                    getLockSettings().checkPattern(patternToString(pattern, userId), userId,

                            wrapCallback(progressCallback));



            if (response.getResponseCode() == VerifyCredentialResponse.RESPONSE_OK) {

media/java/android/media/ImageReader.java

+0 −25
Original line number Diff line number Diff line
@@ -545,31 +545,6 @@ public class ImageReader implements AutoCloseable { 
        }

    }



    /**

     * Discard any free buffers owned by this ImageReader.

     *

     * <p>

     * Generally, the ImageReader caches buffers for reuse once they have been

     * allocated, for best performance. However, sometimes it may be important to

     * release all the cached, unused buffers to save on memory.

     * </p>

     * <p>

     * Calling this method will discard all free cached buffers. This does not include any buffers

     * associated with Images acquired from the ImageReader, any filled buffers waiting to be

     * acquired, and any buffers currently in use by the source rendering buffers into the

     * ImageReader's Surface.

     * <p>

     * The ImageReader continues to be usable after this call, but may need to reallocate buffers

     * when more buffers are needed for rendering.

     * </p>

     * @hide

     */

    public void discardFreeBuffers() {

        synchronized (mCloseLock) {

            nativeDiscardFreeBuffers();

        }

    }



    @Override

    protected void finalize() throws Throwable {

        try {

services/core/java/com/android/server/connectivity/Tethering.java

+1 −1
Original line number Diff line number Diff line
@@ -1455,7 +1455,7 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering 


                Network network = null;

                if (upType != ConnectivityManager.TYPE_NONE) {

                    Network network = getConnectivityManager().getNetworkForType(upType);

                    network = getConnectivityManager().getNetworkForType(upType);

                    NetPluginDelegate.setUpstream(network);

                    LinkProperties linkProperties = cm.getLinkProperties(upType);

                    if (linkProperties != null) {