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

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

Snap for 5715871 from d75df1b6 to qt-qpr1-release 

Change-Id: I1d5ae2320264d1aefc42e0ce906b8a6e6a2ffa01
parents 3888945e d75df1b6

core/java/android/app/AppOpsManager.java

+20 −11
Original line number Diff line number Diff line
@@ -240,7 +240,8 @@ public class AppOpsManager { 
    public @interface UidState {}



    /**

     * Uid state: The UID is a foreground persistent app.

     * Uid state: The UID is a foreground persistent app. The lower the UID

     * state the more important the UID is for the user.

     * @hide

     */

    @TestApi
@@ -248,7 +249,8 @@ public class AppOpsManager { 
    public static final int UID_STATE_PERSISTENT = 100;



    /**

     * Uid state: The UID is top foreground app.

     * Uid state: The UID is top foreground app. The lower the UID

     * state the more important the UID is for the user.

     * @hide

     */

    @TestApi
@@ -257,6 +259,7 @@ public class AppOpsManager { 


    /**

     * Uid state: The UID is running a foreground service of location type.

     * The lower the UID state the more important the UID is for the user.

     * @hide

     */

    @TestApi
@@ -264,7 +267,8 @@ public class AppOpsManager { 
    public static final int UID_STATE_FOREGROUND_SERVICE_LOCATION = 300;



    /**

     * Uid state: The UID is running a foreground service.

     * Uid state: The UID is running a foreground service. The lower the UID

     * state the more important the UID is for the user.

     * @hide

     */

    @TestApi
@@ -279,7 +283,8 @@ public class AppOpsManager { 
    public static final int UID_STATE_MAX_LAST_NON_RESTRICTED = UID_STATE_FOREGROUND_SERVICE;



    /**

     * Uid state: The UID is a foreground app.

     * Uid state: The UID is a foreground app. The lower the UID

     * state the more important the UID is for the user.

     * @hide

     */

    @TestApi
@@ -287,7 +292,8 @@ public class AppOpsManager { 
    public static final int UID_STATE_FOREGROUND = 500;



    /**

     * Uid state: The UID is a background app.

     * Uid state: The UID is a background app. The lower the UID

     * state the more important the UID is for the user.

     * @hide

     */

    @TestApi
@@ -295,7 +301,8 @@ public class AppOpsManager { 
    public static final int UID_STATE_BACKGROUND = 600;



    /**

     * Uid state: The UID is a cached app.

     * Uid state: The UID is a cached app. The lower the UID

     * state the more important the UID is for the user.

     * @hide

     */

    @TestApi
@@ -2507,7 +2514,7 @@ public class AppOpsManager { 
        }



        /**

         * @return The duration of the operation in milliseconds.

         * @return The duration of the operation in milliseconds. The duration is in wall time.

         */

        public long getDuration() {

            return getLastDuration(MAX_PRIORITY_UID_STATE, MIN_PRIORITY_UID_STATE, OP_FLAGS_ALL);
@@ -2515,7 +2522,7 @@ public class AppOpsManager { 


        /**

         * Return the duration in milliseconds the app accessed this op while

         * in the foreground.

         * in the foreground. The duration is in wall time.

         *

         * @param flags The flags which are any combination of

         * {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
@@ -2534,7 +2541,7 @@ public class AppOpsManager { 


        /**

         * Return the duration in milliseconds the app accessed this op while

         * in the background.

         * in the background. The duration is in wall time.

         *

         * @param flags The flags which are any combination of

         * {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
@@ -2553,7 +2560,7 @@ public class AppOpsManager { 


        /**

         * Return the duration in milliseconds the app accessed this op for

         * a given range of UID states.

         * a given range of UID states. The duration is in wall time.

         *

         * @param fromUidState The UID state for which to query. Could be one of

         * {@link #UID_STATE_PERSISTENT}, {@link #UID_STATE_TOP},
@@ -3968,6 +3975,7 @@ public class AppOpsManager { 


        /**

         * Gets the total duration the app op was accessed (performed) in the foreground.

         * The duration is in wall time.

         *

         * @param flags The flags which are any combination of

         * {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
@@ -3986,6 +3994,7 @@ public class AppOpsManager { 


        /**

         * Gets the total duration the app op was accessed (performed) in the background.

         * The duration is in wall time.

         *

         * @param flags The flags which are any combination of

         * {@link #OP_FLAG_SELF}, {@link #OP_FLAG_TRUSTED_PROXY},
@@ -4004,7 +4013,7 @@ public class AppOpsManager { 


        /**

         * Gets the total duration the app op was accessed (performed) for a given

         * range of UID states.

         * range of UID states. The duration is in wall time.

         *

         * @param fromUidState The UID state from which to query. Could be one of

         * {@link #UID_STATE_PERSISTENT}, {@link #UID_STATE_TOP},

core/res/res/values-af/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ 
    <string name="face_acquired_too_right" msgid="3667075962661863218">"Beweeg foon na links."</string>

    <string name="face_acquired_too_left" msgid="3148242963894703424">"Beweeg foon na regs."</string>

    <string name="face_acquired_poor_gaze" msgid="5606479370806754905">"Kyk asseblief meer reguit na jou toestel."</string>

    <string name="face_acquired_not_detected" msgid="4885504661626728809">"Kan nie jou gesig sien nie. Kyk na die foon."</string>

    <string name="face_acquired_not_detected" msgid="1879714205006680222">"Posisioneer jou gesig direk voor die foon."</string>

    <string name="face_acquired_too_much_motion" msgid="3149332171102108851">"Te veel beweging. Hou foon stil."</string>

    <string name="face_acquired_recalibrate" msgid="8077949502893707539">"Skryf jou gesig asseblief weer in."</string>

    <string name="face_acquired_too_different" msgid="7663983770123789694">"Kan nie meer gesig herken nie. Probeer weer."</string>

core/res/res/values-am/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ 
    <string name="face_acquired_too_right" msgid="3667075962661863218">"ስልክን ወደ ግራ ያንቀሳቅሱ።"</string>

    <string name="face_acquired_too_left" msgid="3148242963894703424">"ስልክን ወደ ቀኝ ያንቀሳቅሱ።"</string>

    <string name="face_acquired_poor_gaze" msgid="5606479370806754905">"እባክዎ መሣሪያዎን ይበልጥ በቀጥታ ይመልከቱ።"</string>

    <string name="face_acquired_not_detected" msgid="4885504661626728809">"የእርስዎን ፊት መመልከት አይችልም። ስልኩ ላይ ይመልከቱ።"</string>

    <string name="face_acquired_not_detected" msgid="1879714205006680222">"መልክዎን በቀጥታ ከስልኩ ፊት ያድርጉት።"</string>

    <string name="face_acquired_too_much_motion" msgid="3149332171102108851">"ከልክ በላይ ብዙ እንቅስቃሴ። ስልኩን ቀጥ አድርገው ይያዙት።"</string>

    <string name="face_acquired_recalibrate" msgid="8077949502893707539">"እባክዎ ፊትዎን እንደገና ያስመዝግቡ"</string>

    <string name="face_acquired_too_different" msgid="7663983770123789694">"ከእንግዲህ ፊትን ለይቶ ማወቅ አይችልም። እንደገና ይሞክሩ።"</string>

core/res/res/values-ar/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ 
    <string name="face_acquired_too_right" msgid="3667075962661863218">"يُرجى نقل الهاتف إلى اليمين."</string>

    <string name="face_acquired_too_left" msgid="3148242963894703424">"يُرجى نقل الهاتف إلى اليسار."</string>

    <string name="face_acquired_poor_gaze" msgid="5606479370806754905">"يُرجى النظر إلى جهازك مباشرة أكثر."</string>

    <string name="face_acquired_not_detected" msgid="4885504661626728809">"يتعذّر رؤية وجهك. يُرجى النظر إلى الهاتف."</string>

    <string name="face_acquired_not_detected" msgid="1879714205006680222">"ضع وجهك أمام الهاتف مباشرة."</string>

    <string name="face_acquired_too_much_motion" msgid="3149332171102108851">"حركة أكثر من اللازم يُرجى حمل بدون حركة."</string>

    <string name="face_acquired_recalibrate" msgid="8077949502893707539">"يُرجى إعادة تسجيل وجهك."</string>

    <string name="face_acquired_too_different" msgid="7663983770123789694">"لم يعُد يمكن التعرّف على الوجه. حاول مرة أخرى."</string>

core/res/res/values-as/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ 
    <string name="face_acquired_too_right" msgid="3667075962661863218">"ফ’নটো বাওঁফালে নিয়ক।"</string>

    <string name="face_acquired_too_left" msgid="3148242963894703424">"ফ’নটো সোঁফালে নিয়ক।"</string>

    <string name="face_acquired_poor_gaze" msgid="5606479370806754905">"আপোনাৰ ডিভাইচটোলৈ অধিক পোনে পোনে চাওক।"</string>

    <string name="face_acquired_not_detected" msgid="4885504661626728809">"আপোনাৰ মুখমণ্ডল দেখা নাই। ফ’নটোলৈ চাওক।"</string>

    <string name="face_acquired_not_detected" msgid="1879714205006680222">"আপোনাৰ মুখখন পোনপটীয়াকৈ ফ’নটোৰ সন্মুখত ৰাখক।"</string>

    <string name="face_acquired_too_much_motion" msgid="3149332171102108851">"বেছি লৰচৰ কৰি আছে। ফ’নটো স্থিৰকৈ ধৰক।"</string>

    <string name="face_acquired_recalibrate" msgid="8077949502893707539">"আপোনাৰ মুখমণ্ডল পুনৰ পঞ্জীয়ন কৰক।"</string>

    <string name="face_acquired_too_different" msgid="7663983770123789694">"মুখমণ্ডল আৰু চিনাক্ত কৰিব নোৱাৰি। আকৌ চেষ্টা কৰক।"</string>