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

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

Merge cherrypicks of [7995446, 7995447, 7996042, 7996138, 7995448, 7995449,... 

Merge cherrypicks of [7995446, 7995447, 7996042, 7996138, 7995448, 7995449, 7995789, 7995790, 7995450, 7996029, 7996030, 7996139, 7996140, 7996141, 7996142, 7996143, 7996144, 7995544, 7995545, 7995546, 7995547, 7995548, 7995549, 7995550, 7996145, 7996146, 7996032, 7996147, 7996148, 7996149, 7996150, 7994747, 7994748, 7995451, 7994749, 7994750, 7995966, 7995967, 7994751, 7996151, 7996152, 7996153] into pi-qpr3-b-release

Change-Id: I3fe0a777a941f10d12cc8ada07876a8f2e5e1418
parents b8696203 a3757425

core/java/android/os/Binder.java

+2 −0
Original line number Diff line number Diff line
@@ -740,6 +740,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/jni/android_view_SurfaceControl.cpp

+2 −1
Original line number Diff line number Diff line
@@ -308,7 +308,8 @@ static jobject nativeCaptureLayers(JNIEnv* env, jclass clazz, jobject layerHandl 
                                       buffer->getHeight(),

                                       buffer->getPixelFormat(),

                                       (jint)buffer->getUsage(),

                                       (jlong)buffer.get());

                                       (jlong)buffer.get(),

                                       false /* capturedSecureLayers */);

}



static void nativeApplyTransaction(JNIEnv* env, jclass clazz, jlong transactionObj, jboolean sync) {

packages/VpnDialogs/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 


    <uses-permission android:name="android.permission.CONTROL_VPN" />

    <uses-permission android:name="android.permission.CONNECTIVITY_INTERNAL" />

    <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/>



    <application android:label="VpnDialogs"

                 android:allowBackup="false">

packages/VpnDialogs/src/com/android/vpndialogs/AlwaysOnDisconnectedDialog.java

+7 −3
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 


package com.android.vpndialogs;



import static android.view.WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;

import static android.view.WindowManager.LayoutParams.TYPE_SYSTEM_ALERT;



import android.content.Context;

import android.content.DialogInterface;

import android.content.Intent;
@@ -31,7 +35,6 @@ import android.text.method.LinkMovementMethod; 
import android.text.style.ClickableSpan;

import android.util.Log;

import android.view.View;

import android.view.WindowManager;

import android.widget.TextView;



import com.android.internal.app.AlertActivity;
@@ -74,8 +77,9 @@ public class AlwaysOnDisconnectedDialog extends AlertActivity 
        setupAlert();



        getWindow().setCloseOnTouchOutside(false);

        getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);

        getWindow().addFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);

        getWindow().setType(TYPE_SYSTEM_ALERT);

        getWindow().addFlags(FLAG_ALT_FOCUSABLE_IM);

        getWindow().addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

    }



    @Override

packages/VpnDialogs/src/com/android/vpndialogs/ConfirmDialog.java

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


package com.android.vpndialogs;



import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;



import android.content.Context;

import android.content.DialogInterface;

import android.content.pm.PackageManager;
@@ -78,6 +80,7 @@ public class ConfirmDialog extends AlertActivity 
        setupAlert();



        getWindow().setCloseOnTouchOutside(false);

        getWindow().addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);

        Button button = mAlert.getButton(DialogInterface.BUTTON_POSITIVE);

        button.setFilterTouchesWhenObscured(true);

    }