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

Commit 2afae796 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Treat Telephony as legacy app for now. 

Telephony stack is relying on non-existant ContentProviders for
sending Uri change notifications; it'll eventually need to move over
to using real ContentProviders, but apply this band-aid for now.

Test: builds, boots, SMS send/receive works
Bug: 35792675
Change-Id: Ice66278f876f1c754852300da7eb045a7c778d14
parent 69498632

core/java/android/content/ContentResolver.java

+7 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.database.IContentObserver; 
import android.graphics.Point;

import android.graphics.drawable.Drawable;

import android.net.Uri;

import android.os.Build;

import android.os.Bundle;

import android.os.CancellationSignal;

import android.os.DeadObjectException;
@@ -500,8 +501,13 @@ public abstract class ContentResolver { 
    public ContentResolver(Context context) {

        mContext = context != null ? context : ActivityThread.currentApplication();

        mPackageName = mContext.getOpPackageName();

        if (android.os.Process.myUid() == android.os.Process.PHONE_UID) {

            // STOPSHIP: Telephony needs to fix b/35792675

            mTargetSdkVersion = Build.VERSION_CODES.N_MR1;

        } else {

            mTargetSdkVersion = mContext.getApplicationInfo().targetSdkVersion;

        }

    }



    /** @hide */

    protected abstract IContentProvider acquireProvider(Context c, String name);