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

Unverified Commit 7bb7f41c authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-8.1.0_r50' into staging/lineage-15.1_merge-android-8.1.0_r50 

Android 8.1.0 Release 50 (OPM7.181105.004)

* tag 'android-8.1.0_r50':
  RESTRICT AUTOMERGE: Revert "RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions."
  Verify number of Map entries written to Parcel
  RESTRICT AUTOMERGE: Check both self and shared user id package for requested permissions.
  RESTRICT AUTOMERGE: Hide overlay windows when requesting media projection permission.

Change-Id: I0c42757d48299ffe3b2a60391a67f0c8f2e466bb
parents 3cfff440 f9cc11e6

core/java/android/os/Parcel.java

+9 −1
Original line number Diff line number Diff line
@@ -806,11 +806,19 @@ public final class Parcel { 
            return;

        }

        Set<Map.Entry<String,Object>> entries = val.entrySet();

        writeInt(entries.size());

        int size = entries.size();

        writeInt(size);



        for (Map.Entry<String,Object> e : entries) {

            writeValue(e.getKey());

            writeValue(e.getValue());

            size--;

        }



        if (size != 0) {

            throw new BadParcelableException("Map size does not match number of entries!");

        }



    }



    /**

packages/SystemUI/AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -199,6 +199,9 @@ 
    <!-- to change themes - light or dark -->

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



    <!-- permission necessary to hide non-system overlay windows from covering up the SystemUI -->

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



    <application

        android:name=".SystemUIApplication"

        android:persistent="true"

packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java

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


package com.android.systemui.media;



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



import android.app.Activity;

import android.app.AlertDialog;

import android.content.DialogInterface;
@@ -36,6 +38,7 @@ import android.text.TextPaint; 
import android.text.TextUtils;

import android.text.style.StyleSpan;

import android.util.Log;

import android.view.Window;

import android.view.WindowManager;

import android.widget.CheckBox;

import android.widget.CompoundButton;
@@ -146,7 +149,9 @@ public class MediaProjectionPermissionActivity extends Activity 
        mDialog.getButton(DialogInterface.BUTTON_POSITIVE).setFilterTouchesWhenObscured(true);



        ((CheckBox) mDialog.findViewById(R.id.remember)).setOnCheckedChangeListener(this);

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

        final Window w = mDialog.getWindow();

        w.setType(WindowManager.LayoutParams.TYPE_SYSTEM_ALERT);

        w.addPrivateFlags(PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS);



        mDialog.show();

    }

services/core/java/com/android/server/wm/WindowManagerService.java

+8 −1
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import static android.view.WindowManager.LayoutParams.INPUT_FEATURE_NO_INPUT_CHA 
import static android.view.WindowManager.LayoutParams.LAST_APPLICATION_WINDOW;

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

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

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

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

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

import static android.view.WindowManager.LayoutParams.TYPE_DOCK_DIVIDER;
@@ -1984,6 +1985,11 @@ public class WindowManagerService extends IWindowManager.Stub 
                    // No move or resize, but the controller checks for title changes as well

                    mAccessibilityController.onSomeWindowResizedOrMovedLocked();

                }



                if ((flagChanges & PRIVATE_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS) != 0) {

                    updateNonSystemOverlayWindowsVisibilityIfNeeded(

                            win, win.mWinAnimator.getShown());

                }

            }



            if (DEBUG_LAYOUT) Slog.v(TAG_WM, "Relayout " + win + ": viewVisibility=" + viewVisibility
@@ -7709,7 +7715,8 @@ public class WindowManagerService extends IWindowManager.Stub 
    }



    void updateNonSystemOverlayWindowsVisibilityIfNeeded(WindowState win, boolean surfaceShown) {

        if (!win.hideNonSystemOverlayWindowsWhenVisible()) {

        if (!win.hideNonSystemOverlayWindowsWhenVisible()

                && !mHidingNonSystemOverlayWindows.contains(win)) {

            return;

        }

        final boolean systemAlertWindowsHidden = !mHidingNonSystemOverlayWindows.isEmpty();