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

Unverified Commit 86f62478 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-9.0.0_r46' into staging/lineage-16.0_merge-android-9.0.0_r46 

Android 9.0.0 Release 46 (PQ3A.190801.002)

* tag 'android-9.0.0_r46':
  Collect APK certificates after an OTA, rather than relying on timestamps
  [RESTRICT AUTOMERGE] Protect VPN dialogs against overlay.
  Clear the Parcel before writing an exception during a transaction
  DO NOT MERGE SurfaceControl: Fix captureLayers JNI
  Clean up ProcessRecord when reuse a pid.
  [RESTRICT AUTOMERGE] Fix NullPointerException when mLockPatternUtils is not set.
  Update API docs for TelecomManager#endCall.
  [RESTRICT AUTOMERGE] Make LockTaskController default behaviour match ScreenPinningSettings.

Change-Id: I90c580e1e5d06e5157f87a4ba047e1cf8bf8697d
parents c29588aa 098e0a64

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

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

                                       (jint)buffer->getUsage(),

                                       (jlong)buffer.get(),

                                       false);

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

    }