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

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

Snap for 6013205 from 08e60f17 to qt-qpr2-release 

Change-Id: I6aacbeb32dcb867c49ed6758e6adacf429ec6225
parents 99557f45 08e60f17

core/java/com/android/internal/util/ScreenshotHelper.java

+9 −7
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ import android.content.ComponentName; 
import android.content.Context;

import android.content.Intent;

import android.content.ServiceConnection;

import android.net.Uri;

import android.os.Handler;

import android.os.IBinder;

import android.os.Message;
@@ -58,7 +59,7 @@ public class ScreenshotHelper { 
     */

    public void takeScreenshot(final int screenshotType, final boolean hasStatus,

            final boolean hasNav, @NonNull Handler handler,

            @Nullable Consumer<Boolean> completionConsumer) {

            @Nullable Consumer<Uri> completionConsumer) {

        takeScreenshot(screenshotType, hasStatus, hasNav, SCREENSHOT_TIMEOUT_MS, handler,

                completionConsumer);

    }
@@ -83,12 +84,12 @@ public class ScreenshotHelper { 
     *                           the screenshot attempt will be cancelled and `completionConsumer`

     *                           will be run.

     * @param handler            A handler used in case the screenshot times out

     * @param completionConsumer Consumes `false` if a screenshot was not taken, and `true` if the

     *                           screenshot was taken.

     * @param completionConsumer Consumes `null` if a screenshot was not taken, and the URI of the

     *                           screenshot if the screenshot was taken.

     */

    public void takeScreenshot(final int screenshotType, final boolean hasStatus,

            final boolean hasNav, long timeoutMs, @NonNull Handler handler,

            @Nullable Consumer<Boolean> completionConsumer) {

            @Nullable Consumer<Uri> completionConsumer) {

        synchronized (mScreenshotLock) {

            if (mScreenshotConnection != null) {

                return;
@@ -108,7 +109,7 @@ public class ScreenshotHelper { 
                        }

                    }

                    if (completionConsumer != null) {

                        completionConsumer.accept(false);

                        completionConsumer.accept(null);

                    }

                }

            };
@@ -134,8 +135,9 @@ public class ScreenshotHelper { 
                                        handler.removeCallbacks(mScreenshotTimeout);

                                    }

                                }



                                if (completionConsumer != null) {

                                    completionConsumer.accept(true);

                                    completionConsumer.accept((Uri) msg.obj);

                                }

                            }

                        };
@@ -148,7 +150,7 @@ public class ScreenshotHelper { 
                        } catch (RemoteException e) {

                            Log.e(TAG, "Couldn't take screenshot: " + e);

                            if (completionConsumer != null) {

                                completionConsumer.accept(false);

                                completionConsumer.accept(null);

                            }

                        }

                    }

core/res/res/values-mcc310-mnc170/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -22,5 +22,9 @@ 
<resources>

    <!-- Enable 5 bar signal strength icon -->

    <bool name="config_inflateSignalStrength">true</bool>



    <!-- Boolean indicating whether frameworks needs to reset cell broadcast geo-fencing

         check after reboot or airplane mode toggling -->

    <bool translatable="false" name="reset_geo_fencing_check_after_boot_or_apm">true</bool>

</resources>

core/res/res/values-mcc310-mnc380/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -22,5 +22,9 @@ 
<resources>

    <!-- Enable 5 bar signal strength icon -->

    <bool name="config_inflateSignalStrength">true</bool>



    <!-- Boolean indicating whether frameworks needs to reset cell broadcast geo-fencing

         check after reboot or airplane mode toggling -->

    <bool translatable="false" name="reset_geo_fencing_check_after_boot_or_apm">true</bool>

</resources>

core/res/res/values-mcc310-mnc410/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -52,4 +52,7 @@ 
    <!-- Enable 5 bar signal strength icon -->

    <bool name="config_inflateSignalStrength">true</bool>



    <!-- Boolean indicating whether frameworks needs to reset cell broadcast geo-fencing

         check after reboot or airplane mode toggling -->

    <bool translatable="false" name="reset_geo_fencing_check_after_boot_or_apm">true</bool>

</resources>

core/res/res/values-mcc310-mnc560/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -22,5 +22,9 @@ 
<resources>

    <!-- Enable 5 bar signal strength icon -->

    <bool name="config_inflateSignalStrength">true</bool>



    <!-- Boolean indicating whether frameworks needs to reset cell broadcast geo-fencing

         check after reboot or airplane mode toggling -->

    <bool translatable="false" name="reset_geo_fencing_check_after_boot_or_apm">true</bool>

</resources>