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

Commit 1be371dd authored by Joe Onorato's avatar Joe Onorato Committed by Android (Google) Code Review
Browse files

Merge changes I9706478e,I3fe2dea3,Ic65566c0 into qt-dev 

* changes:
  Make libplatformprotos-static, which is safe to use when you don't have shared libraries.
  Add additional system properties that can disable the face debugging codepath
  Fix mMaxOffset not initialized.
parents cf457b24 9bd5db7a

Android.bp

+29 −0
Original line number Diff line number Diff line
@@ -1050,6 +1050,35 @@ cc_library { 
    },

}



// This library is meant for vendor code that needs to output protobuf. It links

// against the static version of libprotobuf-cpp-lite, for which we can not guarantee

// binary compatibility.

cc_library {

    name: "libplatformprotos-static",

    defaults: ["libplatformprotos-defaults"],

    host_supported: false,



    // This is okay because this library is only built as a static library.  The C++

    // API is not guaranteed. The proto API is guaranteed to be stable via Metrics Council,

    // but is not authorized to be used outside of debugging.

    vendor_available: true,



    target: {

        android: {

            proto: {

                type: "lite",

            },

            static_libs: [

                "libprotobuf-cpp-lite",

            ],

            shared: {

                enabled: false,

            },

        },

    },

}





// This is the full proto version of libplatformprotos. It may only

// be used by test code that is not shipped on the device.

cc_library {

libs/protoutil/src/ProtoFileReader.cpp

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ ProtoFileReader::ProtoFileReader(int fd) 
         mSize(get_file_size(fd)),

         mPos(0),

         mOffset(0),

         mMaxOffset(0),

         mChunkSize(sizeof(mBuffer)) {

}

services/core/java/com/android/server/biometrics/face/FaceService.java

+8 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import android.os.Environment; 
import android.os.IBinder;

import android.os.RemoteException;

import android.os.SELinux;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.UserManager;

import android.service.restricted_image.RestrictedImageProto;
@@ -1091,6 +1092,13 @@ public class FaceService extends BiometricServiceBase { 
            return;

        }



        // Additionally, this flag allows turning off face for a device

        // (either permanently through the build or on an individual device).

        if (SystemProperties.getBoolean("ro.face.disable_debug_data", false)

                || SystemProperties.getBoolean("persist.face.disable_debug_data", false)) {

            return;

        }



        final ProtoOutputStream proto = new ProtoOutputStream(fd);



        final long setToken = proto.start(RestrictedImagesDumpProto.SETS);