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

Unverified Commit 280b3f81 authored by Kevin F. Haggerty's avatar Kevin F. Haggerty
Browse files

Merge tag 'android-9.0.0_r59' of... 

Merge tag 'android-9.0.0_r59' of https://android.googlesource.com/platform/frameworks/base into staging/lineage-16.0_merge-android-9.0.0_r59

Android 9.0.0 Release 59 (6559974)

* tag 'android-9.0.0_r59' of https://android.googlesource.com/platform/frameworks/base:
  DO NOT MERGE Make intents immutable
  More fixes towards the race conditions in AMS
  Add back enforceReadPermission for getmetadata
  RESTRICT AUTOMERGE
  DO NOT MERGE - Kill apps outright for API contract violations
  RESTRICT AUTOMERGE Prevent accessing companion records from arbitrary uids
  Verify all possible hosts that match web nav

Change-Id: I25dd0cdeac26ec449b920b7f28e14ab6d926a24b
parents 56241850 6c68f9b4

core/java/android/app/IActivityManager.aidl

+2 −1
Original line number Diff line number Diff line
@@ -278,7 +278,8 @@ interface IActivityManager { 
    boolean isImmersive(in IBinder token);

    void setImmersive(in IBinder token, boolean immersive);

    boolean isTopActivityImmersive();

    void crashApplication(int uid, int initialPid, in String packageName, int userId, in String message);

    void crashApplication(int uid, int initialPid, in String packageName, int userId,

            in String message, boolean force);

    String getProviderMimeType(in Uri uri, int userId);

    IBinder newUriPermissionOwner(in String name);

    void grantUriPermissionFromOwner(in IBinder owner, int fromUid, in String targetPkg,

core/java/android/app/Presentation.java

+15 −8
Original line number Diff line number Diff line
@@ -19,24 +19,25 @@ package android.app; 
import static android.content.Context.DISPLAY_SERVICE;

import static android.content.Context.WINDOW_SERVICE;

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

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



import android.content.Context;

import android.content.res.Resources;

import android.hardware.display.DisplayManager;

import android.hardware.display.DisplayManager.DisplayListener;

import android.os.Binder;

import android.os.Handler;

import android.os.IBinder;

import android.os.Message;

import android.util.DisplayMetrics;

import android.util.Log;

import android.util.TypedValue;

import android.view.ContextThemeWrapper;

import android.view.Display;

import android.view.Gravity;

import android.view.Window;

import android.view.WindowManager;

import android.view.WindowManagerImpl;

import android.os.Handler;

import android.os.Message;

import android.util.DisplayMetrics;

import android.util.Log;

import android.util.TypedValue;



/**

 * Base class for presentations.
@@ -115,7 +116,9 @@ import android.util.TypedValue; 
 * The display manager keeps track of all displays in the system.  However, not all

 * displays are appropriate for showing presentations.  For example, if an activity

 * attempted to show a presentation on the main display it might obscure its own content

 * (it's like opening a dialog on top of your activity).

 * (it's like opening a dialog on top of your activity).  Creating a presentation on the main

 * display will result in {@link android.view.WindowManager.InvalidDisplayException} being thrown

 * when invoking {@link #show()}.

 * </p><p>

 * Here's how to identify suitable displays for showing presentations using

 * {@link DisplayManager#getDisplays(String)} and the
@@ -188,12 +191,16 @@ public class Presentation extends Dialog { 
        mDisplay = display;

        mDisplayManager = (DisplayManager)getContext().getSystemService(DISPLAY_SERVICE);



        final int windowType =

                (display.getFlags() & Display.FLAG_PRIVATE) != 0 ? TYPE_PRIVATE_PRESENTATION

                        : TYPE_PRESENTATION;



        final Window w = getWindow();

        final WindowManager.LayoutParams attr = w.getAttributes();

        attr.token = mToken;

        w.setAttributes(attr);

        w.setGravity(Gravity.FILL);

        w.setType(TYPE_PRESENTATION);

        w.setType(windowType);

        setCanceledOnTouchOutside(false);

    }
@@ -242,7 +249,7 @@ public class Presentation extends Dialog { 
    /**

     * Inherited from {@link Dialog#show}. Will throw

     * {@link android.view.WindowManager.InvalidDisplayException} if the specified secondary

     * {@link Display} can't be found.

     * {@link Display} can't be found or if it does not have {@link Display#FLAG_PRESENTATION} set.

     */

    @Override

    public void show() {

core/java/android/provider/DocumentsProvider.java

+1 −0
Original line number Diff line number Diff line
@@ -1144,6 +1144,7 @@ public abstract class DocumentsProvider extends ContentProvider { 


            out.putParcelable(DocumentsContract.EXTRA_RESULT, path);

        } else if (METHOD_GET_DOCUMENT_METADATA.equals(method)) {

            enforceReadPermissionInner(documentUri, getCallingPackage(), null);

            return getDocumentMetadata(documentId);

        } else {

            throw new UnsupportedOperationException("Method not supported " + method);

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java

+5 −3
Original line number Diff line number Diff line
@@ -635,7 +635,8 @@ public class PhoneStatusBarPolicy implements Callback, Callbacks, 
        String message = mContext.getString(R.string.instant_apps_message);

        PendingIntent appInfoAction = PendingIntent.getActivity(mContext, 0,

                new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)

                        .setData(Uri.fromParts("package", pkg, null)), 0);

                        .setData(Uri.fromParts("package", pkg, null)),

                        PendingIntent.FLAG_IMMUTABLE);

        Action action = new Notification.Action.Builder(null, mContext.getString(R.string.app_info),

                appInfoAction).build();
@@ -649,7 +650,7 @@ public class PhoneStatusBarPolicy implements Callback, Callbacks, 
                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);



            PendingIntent pendingIntent = PendingIntent.getActivity(mContext,

                    0 /* requestCode */, browserIntent, 0 /* flags */);

                    0 /* requestCode */, browserIntent, PendingIntent.FLAG_IMMUTABLE);

            ComponentName aiaComponent = null;

            try {

                aiaComponent = AppGlobals.getPackageManager().getInstantAppInstallerComponent();
@@ -667,7 +668,8 @@ public class PhoneStatusBarPolicy implements Callback, Callbacks, 
                    .putExtra(Intent.EXTRA_EPHEMERAL_FAILURE, pendingIntent)

                    .putExtra(Intent.EXTRA_INSTANT_APP_FAILURE, pendingIntent);



            PendingIntent webPendingIntent = PendingIntent.getActivity(mContext, 0, goToWebIntent, 0);

            PendingIntent webPendingIntent = PendingIntent.getActivity(

                    mContext, 0, goToWebIntent, PendingIntent.FLAG_IMMUTABLE);

            Action webAction = new Notification.Action.Builder(null, mContext.getString(R.string.go_to_web),

                    webPendingIntent).build();

            builder.addAction(webAction);

services/core/java/com/android/server/am/ActiveServices.java

+10 −1
Original line number Diff line number Diff line
@@ -791,6 +791,15 @@ public final class ActiveServices { 
        }

    }



    void killMisbehavingService(ServiceRecord r,

            int appUid, int appPid, String localPackageName) {

        synchronized (mAm) {

            stopServiceLocked(r);

            mAm.crashApplication(appUid, appPid, localPackageName, -1,

                    "Bad notification for startForeground", true /*force*/);

        }

    }



    IBinder peekServiceLocked(Intent service, String resolvedType, String callingPackage) {

        ServiceLookupResult r = retrieveServiceLocked(service, resolvedType, callingPackage,

                Binder.getCallingPid(), Binder.getCallingUid(),
@@ -3726,7 +3735,7 @@ public final class ActiveServices { 
    void serviceForegroundCrash(ProcessRecord app, CharSequence serviceRecord) {

        mAm.crashApplication(app.uid, app.pid, app.info.packageName, app.userId,

                "Context.startForegroundService() did not then call Service.startForeground(): "

                    + serviceRecord);

                    + serviceRecord, false /*force*/);

    }



    void scheduleServiceTimeoutLocked(ProcessRecord proc) {