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

Commit 70ccfc70 authored by Luca Stefani's avatar Luca Stefani
Browse files

Merge tag 'android-9.0.0_r21' into lineage-16.0-android-9.0.0_r21 

Android 9.0.0 release 21

* tag 'android-9.0.0_r21':
  Adding new intent ACTION_SMS_MMS_DB_CREATED.
  ActivityThread: purge jemalloc at appropriate times
  Add Missing XML files from 5282778 to fix build Bug:111603898 (cherry picked from commit 974a86e201e2fa17bad58d1fb2f83b7d21ed1580)
  Add configurable default setting for assistant componentname
  wm: recycle bitmaps immediately in TaskSnapshotPersister
  hwui: purge malloc pages on bitmap destruction
  Recover shady content:// paths.
  Keep app in high memory adjust if moving from TOP to FGS
  DO NOT MERGE: Reset launch start times when removing a process

Change-Id: Idf721b2452ddc6714df9f16eebc6cde850988533
parents d11ab042 4056014c

core/java/android/app/ActivityThread.java

+39 −1
Original line number Diff line number Diff line
@@ -359,6 +359,9 @@ public final class ActivityThread extends ClientTransactionHandler { 
        = new ArrayMap<Activity, ArrayList<OnActivityPausedListener>>();



    final GcIdler mGcIdler = new GcIdler();

    final PurgeIdler mPurgeIdler = new PurgeIdler();



    boolean mPurgeIdlerScheduled = false;

    boolean mGcIdlerScheduled = false;



    static volatile Handler sMainThreadHandler;  // set once in main()
@@ -1595,6 +1598,7 @@ public final class ActivityThread extends ClientTransactionHandler { 
        public static final int RUN_ISOLATED_ENTRY_POINT = 158;

        public static final int EXECUTE_TRANSACTION = 159;

        public static final int RELAUNCH_ACTIVITY = 160;

        public static final int PURGE_RESOURCES = 161;



        String codeToString(int code) {

            if (DEBUG_MESSAGES) {
@@ -1638,6 +1642,7 @@ public final class ActivityThread extends ClientTransactionHandler { 
                    case RUN_ISOLATED_ENTRY_POINT: return "RUN_ISOLATED_ENTRY_POINT";

                    case EXECUTE_TRANSACTION: return "EXECUTE_TRANSACTION";

                    case RELAUNCH_ACTIVITY: return "RELAUNCH_ACTIVITY";

                    case PURGE_RESOURCES: return "PURGE_RESOURCES";

                }

            }

            return Integer.toString(code);
@@ -1675,6 +1680,7 @@ public final class ActivityThread extends ClientTransactionHandler { 
                case UNBIND_SERVICE:

                    Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "serviceUnbind");

                    handleUnbindService((BindServiceData)msg.obj);

                    schedulePurgeIdler();

                    Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);

                    break;

                case SERVICE_ARGS:
@@ -1685,6 +1691,7 @@ public final class ActivityThread extends ClientTransactionHandler { 
                case STOP_SERVICE:

                    Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "serviceStop");

                    handleStopService((IBinder)msg.obj);

                    schedulePurgeIdler();

                    Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);

                    break;

                case CONFIGURATION_CHANGED:
@@ -1818,6 +1825,9 @@ public final class ActivityThread extends ClientTransactionHandler { 
                case RELAUNCH_ACTIVITY:

                    handleRelaunchActivityLocally((IBinder) msg.obj);

                    break;

                case PURGE_RESOURCES:

                    schedulePurgeIdler();

                    break;

            }

            Object obj = msg.obj;

            if (obj instanceof SomeArgs) {
@@ -1870,6 +1880,17 @@ public final class ActivityThread extends ClientTransactionHandler { 
        @Override

        public final boolean queueIdle() {

            doGcIfNeeded();

            nPurgePendingResources();

            return false;

        }

    }



    final class PurgeIdler implements MessageQueue.IdleHandler {

        @Override

        public boolean queueIdle() {

            Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "purgePendingResources");

            nPurgePendingResources();

            Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);

            return false;

        }

    }
@@ -2181,6 +2202,22 @@ public final class ActivityThread extends ClientTransactionHandler { 
        mH.removeMessages(H.GC_WHEN_IDLE);

    }



    void schedulePurgeIdler() {

        if (!mPurgeIdlerScheduled) {

            mPurgeIdlerScheduled = true;

            Looper.myQueue().addIdleHandler(mPurgeIdler);

        }

        mH.removeMessages(H.PURGE_RESOURCES);

    }



    void unschedulePurgeIdler() {

        if (mPurgeIdlerScheduled) {

            mPurgeIdlerScheduled = false;

            Looper.myQueue().removeIdleHandler(mPurgeIdler);

        }

        mH.removeMessages(H.PURGE_RESOURCES);

    }



    void doGcIfNeeded() {

        mGcIdlerScheduled = false;

        final long now = SystemClock.uptimeMillis();
@@ -4461,6 +4498,7 @@ public final class ActivityThread extends ClientTransactionHandler { 
            }

            r.setState(ON_DESTROY);

        }

        schedulePurgeIdler();

        mActivities.remove(token);

        StrictMode.decrementExpectedActivityCount(activityClass);

        return r;
@@ -6683,6 +6721,6 @@ public final class ActivityThread extends ClientTransactionHandler { 
    }



    // ------------------ Regular JNI ------------------------



    private native void nPurgePendingResources();

    private native void nDumpGraphicsInfo(FileDescriptor fd);

}

core/java/android/content/ContentProvider.java

+34 −19
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ import java.io.IOException; 
import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Objects;



/**

 * Content providers are one of the primary building blocks of Android applications, providing
@@ -208,7 +209,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 { 
        @Override

        public Cursor query(String callingPkg, Uri uri, @Nullable String[] projection,

                @Nullable Bundle queryArgs, @Nullable ICancellationSignal cancellationSignal) {

            validateIncomingUri(uri);

            uri = validateIncomingUri(uri);

            uri = maybeGetUriWithoutUserId(uri);

            if (enforceReadPermission(callingPkg, uri, null) != AppOpsManager.MODE_ALLOWED) {

                // The caller has no access to the data, so return an empty cursor with
@@ -247,14 +248,14 @@ public abstract class ContentProvider implements ComponentCallbacks2 { 


        @Override

        public String getType(Uri uri) {

            validateIncomingUri(uri);

            uri = validateIncomingUri(uri);

            uri = maybeGetUriWithoutUserId(uri);

            return ContentProvider.this.getType(uri);

        }



        @Override

        public Uri insert(String callingPkg, Uri uri, ContentValues initialValues) {

            validateIncomingUri(uri);

            uri = validateIncomingUri(uri);

            int userId = getUserIdFromUri(uri);

            uri = maybeGetUriWithoutUserId(uri);

            if (enforceWritePermission(callingPkg, uri, null) != AppOpsManager.MODE_ALLOWED) {
@@ -270,7 +271,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 { 


        @Override

        public int bulkInsert(String callingPkg, Uri uri, ContentValues[] initialValues) {

            validateIncomingUri(uri);

            uri = validateIncomingUri(uri);

            uri = maybeGetUriWithoutUserId(uri);

            if (enforceWritePermission(callingPkg, uri, null) != AppOpsManager.MODE_ALLOWED) {

                return 0;
@@ -292,11 +293,12 @@ public abstract class ContentProvider implements ComponentCallbacks2 { 
            for (int i = 0; i < numOperations; i++) {

                ContentProviderOperation operation = operations.get(i);

                Uri uri = operation.getUri();

                validateIncomingUri(uri);

                userIds[i] = getUserIdFromUri(uri);

                if (userIds[i] != UserHandle.USER_CURRENT) {

                    // Removing the user id from the uri.

                    operation = new ContentProviderOperation(operation, true);

                uri = validateIncomingUri(uri);

                uri = maybeGetUriWithoutUserId(uri);

                // Rebuild operation if we changed the Uri above

                if (!Objects.equals(operation.getUri(), uri)) {

                    operation = new ContentProviderOperation(operation, uri);

                    operations.set(i, operation);

                }

                if (operation.isReadOperation()) {
@@ -331,7 +333,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 { 


        @Override

        public int delete(String callingPkg, Uri uri, String selection, String[] selectionArgs) {

            validateIncomingUri(uri);

            uri = validateIncomingUri(uri);

            uri = maybeGetUriWithoutUserId(uri);

            if (enforceWritePermission(callingPkg, uri, null) != AppOpsManager.MODE_ALLOWED) {

                return 0;
@@ -347,7 +349,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 { 
        @Override

        public int update(String callingPkg, Uri uri, ContentValues values, String selection,

                String[] selectionArgs) {

            validateIncomingUri(uri);

            uri = validateIncomingUri(uri);

            uri = maybeGetUriWithoutUserId(uri);

            if (enforceWritePermission(callingPkg, uri, null) != AppOpsManager.MODE_ALLOWED) {

                return 0;
@@ -364,7 +366,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 { 
        public ParcelFileDescriptor openFile(

                String callingPkg, Uri uri, String mode, ICancellationSignal cancellationSignal,

                IBinder callerToken) throws FileNotFoundException {

            validateIncomingUri(uri);

            uri = validateIncomingUri(uri);

            uri = maybeGetUriWithoutUserId(uri);

            enforceFilePermission(callingPkg, uri, mode, callerToken);

            final String original = setCallingPackage(callingPkg);
@@ -380,7 +382,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 { 
        public AssetFileDescriptor openAssetFile(

                String callingPkg, Uri uri, String mode, ICancellationSignal cancellationSignal)

                throws FileNotFoundException {

            validateIncomingUri(uri);

            uri = validateIncomingUri(uri);

            uri = maybeGetUriWithoutUserId(uri);

            enforceFilePermission(callingPkg, uri, mode, null);

            final String original = setCallingPackage(callingPkg);
@@ -406,7 +408,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 { 


        @Override

        public String[] getStreamTypes(Uri uri, String mimeTypeFilter) {

            validateIncomingUri(uri);

            uri = validateIncomingUri(uri);

            uri = maybeGetUriWithoutUserId(uri);

            return ContentProvider.this.getStreamTypes(uri, mimeTypeFilter);

        }
@@ -415,7 +417,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 { 
        public AssetFileDescriptor openTypedAssetFile(String callingPkg, Uri uri, String mimeType,

                Bundle opts, ICancellationSignal cancellationSignal) throws FileNotFoundException {

            Bundle.setDefusable(opts, true);

            validateIncomingUri(uri);

            uri = validateIncomingUri(uri);

            uri = maybeGetUriWithoutUserId(uri);

            enforceFilePermission(callingPkg, uri, "r", null);

            final String original = setCallingPackage(callingPkg);
@@ -434,7 +436,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 { 


        @Override

        public Uri canonicalize(String callingPkg, Uri uri) {

            validateIncomingUri(uri);

            uri = validateIncomingUri(uri);

            int userId = getUserIdFromUri(uri);

            uri = getUriWithoutUserId(uri);

            if (enforceReadPermission(callingPkg, uri, null) != AppOpsManager.MODE_ALLOWED) {
@@ -450,7 +452,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 { 


        @Override

        public Uri uncanonicalize(String callingPkg, Uri uri) {

            validateIncomingUri(uri);

            uri = validateIncomingUri(uri);

            int userId = getUserIdFromUri(uri);

            uri = getUriWithoutUserId(uri);

            if (enforceReadPermission(callingPkg, uri, null) != AppOpsManager.MODE_ALLOWED) {
@@ -467,7 +469,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 { 
        @Override

        public boolean refresh(String callingPkg, Uri uri, Bundle args,

                ICancellationSignal cancellationSignal) throws RemoteException {

            validateIncomingUri(uri);

            uri = validateIncomingUri(uri);

            uri = getUriWithoutUserId(uri);

            if (enforceReadPermission(callingPkg, uri, null) != AppOpsManager.MODE_ALLOWED) {

                return false;
@@ -1901,7 +1903,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 { 
         */

        if (mContext == null) {

            mContext = context;

            if (context != null) {

            if (context != null && mTransport != null) {

                mTransport.mAppOpsManager = (AppOpsManager) context.getSystemService(

                        Context.APP_OPS_SERVICE);

            }
@@ -2010,7 +2012,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 { 
    }



    /** @hide */

    private void validateIncomingUri(Uri uri) throws SecurityException {

    public Uri validateIncomingUri(Uri uri) throws SecurityException {

        String auth = uri.getAuthority();

        if (!mSingleUser) {

            int userId = getUserIdFromAuthority(auth, UserHandle.USER_CURRENT);
@@ -2029,6 +2031,19 @@ public abstract class ContentProvider implements ComponentCallbacks2 { 
            }

            throw new SecurityException(message);

        }



        // Normalize the path by removing any empty path segments, which can be

        // a source of security issues.

        final String encodedPath = uri.getEncodedPath();

        if (encodedPath != null && encodedPath.indexOf("//") != -1) {

            final Uri normalized = uri.buildUpon()

                    .encodedPath(encodedPath.replaceAll("//+", "/")).build();

            Log.w(TAG, "Normalized " + uri + " to " + normalized

                    + " to avoid possible security issues");

            return normalized;

        } else {

            return uri;

        }

    }



    /** @hide */

core/java/android/content/ContentProviderOperation.java

+2 −14
Original line number Diff line number Diff line
@@ -94,13 +94,9 @@ public class ContentProviderOperation implements Parcelable { 
    }



    /** @hide */

    public ContentProviderOperation(ContentProviderOperation cpo, boolean removeUserIdFromUri) {

    public ContentProviderOperation(ContentProviderOperation cpo, Uri withUri) {

        mType = cpo.mType;

        if (removeUserIdFromUri) {

            mUri = ContentProvider.getUriWithoutUserId(cpo.mUri);

        } else {

            mUri = cpo.mUri;

        }

        mUri = withUri;

        mValues = cpo.mValues;

        mSelection = cpo.mSelection;

        mSelectionArgs = cpo.mSelectionArgs;
@@ -110,14 +106,6 @@ public class ContentProviderOperation implements Parcelable { 
        mYieldAllowed = cpo.mYieldAllowed;

    }



    /** @hide */

    public ContentProviderOperation getWithoutUserIdInUri() {

        if (ContentProvider.uriHasUserId(mUri)) {

            return new ContentProviderOperation(this, true);

        }

        return this;

    }



    public void writeToParcel(Parcel dest, int flags) {

        dest.writeInt(mType);

        Uri.writeToParcel(dest, mUri);

core/java/com/android/internal/app/AssistUtils.java

+21 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ import android.os.ServiceManager; 
import android.provider.Settings;

import android.util.Log;



import com.android.internal.R;



/**

 * Utility method for dealing with the assistant aspects of

 * {@link com.android.internal.app.IVoiceInteractionManagerService IVoiceInteractionManagerService}.
@@ -40,6 +42,14 @@ public class AssistUtils { 


    private static final String TAG = "AssistUtils";



    /**

     * Sentinel value for "no default assistant specified."

     *

     * Empty string is already used to represent an explicit setting of No Assistant. null cannot

     * be used because we can't represent a null value in XML.

     */

    private static final String UNSET = "#+UNSET";



    private final Context mContext;

    private final IVoiceInteractionManagerService mVoiceInteractionManagerService;
@@ -152,10 +162,21 @@ public class AssistUtils { 
            return ComponentName.unflattenFromString(setting);

        }



        final String defaultSetting = mContext.getResources().getString(

                R.string.config_defaultAssistantComponentName);

        if (defaultSetting != null && !defaultSetting.equals(UNSET)) {

            return ComponentName.unflattenFromString(defaultSetting);

        }



        // Fallback to keep backward compatible behavior when there is no user setting.

        if (activeServiceSupportsAssistGesture()) {

            return getActiveServiceComponentName();

        }



        if (UNSET.equals(defaultSetting)) {

            return null;

        }



        final SearchManager searchManager =

            (SearchManager) mContext.getSystemService(Context.SEARCH_SERVICE);

        if (searchManager == null) {

core/jni/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ cc_library_shared { 
        "com_google_android_gles_jni_EGLImpl.cpp",

        "com_google_android_gles_jni_GLImpl.cpp", // TODO: .arm

        "android_app_Activity.cpp",

	"android_app_ActivityThread.cpp",

        "android_app_NativeActivity.cpp",

        "android_app_admin_SecurityLog.cpp",

        "android_opengl_EGL14.cpp",