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

Commit d2c1d3b4 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5588664 from 297cdb5a to qt-c2f2-release 

Change-Id: If3aaa52b7d98bd986935ac27a98bbde7a81f3280
parents 0790933b 297cdb5a

core/java/android/os/Binder.java

+2 −0
Original line number Diff line number Diff line
@@ -1033,6 +1033,8 @@ public class Binder implements IBinder { 
                    Log.w(TAG, "Caught a RuntimeException from the binder stub implementation.", e);

                }

            } else {

                // Clear the parcel before writing the exception

                reply.setDataSize(0);

                reply.setDataPosition(0);

                reply.writeException(e);

            }

core/java/android/os/storage/StorageManagerInternal.java

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


package android.os.storage;



import android.annotation.Nullable;

import android.os.IVold;



/**
@@ -101,4 +102,11 @@ public abstract class StorageManagerInternal { 
     * @param listener The listener that will be notified on reset events.

     */

    public abstract void addResetListener(ResetListener listener);



    /**

     * Notified when any app op changes so that storage mount points can be updated if the app op

     * affects them.

     */

    public abstract void onAppOpsChanged(int code, int uid,

            @Nullable String packageName, int mode);

}

core/java/android/provider/Settings.java

+13 −2
Original line number Diff line number Diff line
@@ -8836,6 +8836,15 @@ public final class Settings { 
        public static final String AWARE_ENABLED = "aware_enabled";















        private static final Validator AWARE_ENABLED_VALIDATOR = BOOLEAN_VALIDATOR;

























        /**













         * Controls whether aware_lock is enabled.













         * @hide













         */













        public static final String AWARE_LOCK_ENABLED = "aware_lock_enabled";

























        private static final Validator AWARE_LOCK_ENABLED_VALIDATOR = BOOLEAN_VALIDATOR;



























        /**















         * This are the settings to be backed up.















         *










@@ -8970,7 +8979,8 @@ public final class Settings {













            SILENCE_CALL_GESTURE_COUNT,















            SILENCE_TIMER_GESTURE_COUNT,















            DARK_MODE_DIALOG_SEEN,













            GLOBAL_ACTIONS_PANEL_ENABLED













            GLOBAL_ACTIONS_PANEL_ENABLED,













            AWARE_LOCK_ENABLED















        };





























        /**










@@ -9157,6 +9167,7 @@ public final class Settings {













            VALIDATORS.put(DARK_MODE_DIALOG_SEEN, BOOLEAN_VALIDATOR);















            VALIDATORS.put(UI_NIGHT_MODE, UI_NIGHT_MODE_VALIDATOR);















            VALIDATORS.put(GLOBAL_ACTIONS_PANEL_ENABLED, GLOBAL_ACTIONS_PANEL_ENABLED_VALIDATOR);













            VALIDATORS.put(AWARE_LOCK_ENABLED, AWARE_LOCK_ENABLED_VALIDATOR);















        }





























        /**

































core/res/res/values/strings.xml



+13
−13




























Original line number
Diff line number
Diff line








@@ -1499,16 +1499,16 @@













    <string name="fingerprint_icon_content_description">Fingerprint icon</string>































    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=70] -->













    <string name="permlab_manageFace">manage face authentication hardware</string>













    <string name="permlab_manageFace">manage face unlock hardware</string>















    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=90] -->















    <string name="permdesc_manageFace">Allows the app to invoke methods to add and delete facial templates for use.</string>















    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=70] -->













    <string name="permlab_useFaceAuthentication">use face authentication hardware</string>













    <string name="permlab_useFaceAuthentication">use face unlock hardware</string>















    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=90] -->













    <string name="permdesc_useFaceAuthentication">Allows the app to use face authentication hardware for authentication</string>













    <string name="permdesc_useFaceAuthentication">Allows the app to use face unlock hardware for authentication</string>































    <!-- Notification name shown when the system requires the user to re-enroll their face. [CHAR LIMIT=NONE] -->













    <string name="face_recalibrate_notification_name">Face Authentication</string>













    <string name="face_recalibrate_notification_name">Face unlock</string>















    <!-- Notification title shown when the system requires the user to re-enroll their face. [CHAR LIMIT=NONE] -->















    <string name="face_recalibrate_notification_title">Re-enroll your face</string>















    <!-- Notification content shown when the system requires the user to re-enroll their face. [CHAR LIMIT=NONE] -->










@@ -1561,23 +1561,23 @@













    <!-- Error message shown when the face hardware can't be accessed. [CHAR LIMIT=69] -->















    <string name="face_error_hw_not_available">Can\u2019t verify face. Hardware not available.</string>















    <!-- Error message shown when the face hardware timer has expired and the user needs to restart the operation. [CHAR LIMIT=50] -->













    <string name="face_error_timeout">Try face authentication again.</string>













    <string name="face_error_timeout">Try face unlock again.</string>















    <!-- Error message shown when the face hardware has run out of room for storing faces. [CHAR LIMIT=69] -->















    <string name="face_error_no_space">Can\u2019t store new face data. Delete an old one first.</string>















    <!-- Generic error message shown when the face operation (e.g. enrollment or authentication) is canceled. Generally not shown to the user. [CHAR LIMIT=50] -->













    <string name="face_error_canceled">Face operation canceled</string>













    <!-- Generic error message shown when the face authentication operation is canceled due to user input. Generally not shown to the user [CHAR LIMIT=54] -->













    <string name="face_error_user_canceled">Face authentication canceled by user</string>













    <string name="face_error_canceled">Face operation canceled.</string>













    <!-- Generic error message shown when the face unlock operation is canceled due to user input. Generally not shown to the user [CHAR LIMIT=54] -->













    <string name="face_error_user_canceled">Face unlock canceled by user.</string>















    <!-- Generic error message shown when the face operation fails because too many attempts have been made. [CHAR LIMIT=50] -->















    <string name="face_error_lockout">Too many attempts. Try again later.</string>















    <!-- Generic error message shown when the face operation fails because strong authentication is required. [CHAR LIMIT=71] -->













    <string name="face_error_lockout_permanent">Too many attempts. Face authentication disabled.</string>













    <string name="face_error_lockout_permanent">Too many attempts. Face unlock disabled.</string>















    <!-- Generic error message shown when the face hardware can't recognize the face. [CHAR LIMIT=50] -->















    <string name="face_error_unable_to_process">Can\u2019t verify face. Try again.</string>















    <!-- Generic error message shown when the user has no enrolled face. [CHAR LIMIT=52] -->













    <string name="face_error_not_enrolled">You haven\u2019t set up face authentication</string>













    <!-- Generic error message shown when the app requests face authentication on a device without a sensor. [CHAR LIMIT=61] -->













    <string name="face_error_hw_not_present">Face authentication is not supported on this device</string>













    <string name="face_error_not_enrolled">You haven\u2019t set up face unlock.</string>













    <!-- Generic error message shown when the app requests face unlock on a device without a sensor. [CHAR LIMIT=61] -->













    <string name="face_error_hw_not_present">Face unlock is not supported on this device.</string>































    <!-- Template to be used to name enrolled faces by default. [CHAR LIMIT=10] -->















    <string name="face_name_template">Face <xliff:g id="faceId" example="1">%d</xliff:g></string>










@@ -3614,7 +3614,7 @@













    <!-- Message of notification shown when contaminant is detected on the USB port. [CHAR LIMIT=NONE] -->















    <string name="usb_contaminant_detected_message">USB port is automatically disabled. Tap to learn more.</string>















    <!-- Title of notification shown when contaminant is no longer detected on the USB port. [CHAR LIMIT=NONE] -->













    <string name="usb_contaminant_not_detected_title">Safe to use USB port</string>













    <string name="usb_contaminant_not_detected_title">OK to use USB port</string>















    <!-- Message of notification shown when contaminant is no longer detected on the USB port. [CHAR LIMIT=NONE] -->















    <string name="usb_contaminant_not_detected_message">Phone no longer detects liquid or debris.</string>

















































core/tests/bugreports/src/android/server/bugreports/BugreportManagerTest.java



+8
−4




























Original line number
Diff line number
Diff line








@@ -88,7 +88,9 @@ public class BugreportManagerTest {













    @Test















    public void normalFlow_wifi() throws Exception {















        BugreportCallbackImpl callback = new BugreportCallbackImpl();













        mBrm.startBugreport(mBugreportFd, mScreenshotFd, wifi(), mExecutor, callback);













        // wifi bugreport does not take screenshot













        mBrm.startBugreport(mBugreportFd, null /*screenshotFd = null*/, wifi(),













                mExecutor, callback);















        waitTillDoneOrTimeout(callback);































        assertThat(callback.isDone()).isTrue();









@@ -99,13 +101,15 @@ public class BugreportManagerTest {













        // of mBugreportFd.















        assertThat(callback.getErrorCode()).isEqualTo(















                BugreportCallback.BUGREPORT_ERROR_USER_CONSENT_TIMED_OUT);













        assertFdsAreClosed(mBugreportFd, mScreenshotFd);













        assertFdsAreClosed(mBugreportFd);















    }































    @Test















    public void normalFlow_interactive() throws Exception {















        BugreportCallbackImpl callback = new BugreportCallbackImpl();













        mBrm.startBugreport(mBugreportFd, mScreenshotFd, interactive(), mExecutor, callback);













        // interactive bugreport does not take screenshot













        mBrm.startBugreport(mBugreportFd, null /*screenshotFd = null*/, interactive(),













                mExecutor, callback);































        waitTillDoneOrTimeout(callback);















        assertThat(callback.isDone()).isTrue();









@@ -113,7 +117,7 @@ public class BugreportManagerTest {













        assertThat(callback.hasReceivedProgress()).isTrue();















        assertThat(callback.getErrorCode()).isEqualTo(















                BugreportCallback.BUGREPORT_ERROR_USER_CONSENT_TIMED_OUT);













        assertFdsAreClosed(mBugreportFd, mScreenshotFd);













        assertFdsAreClosed(mBugreportFd);















    }































    @Test