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

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

Snap for 5674421 from ae0c2eeb to pi-platform-release 

Change-Id: I5b1dc16c0696ce8452f8798e68fe417d7533c5df
parents 5c3946d0 ae0c2eeb

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);

    }