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

Commit 1e079054 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Revert "Treat Telephony as legacy app for now."" into oc-dev am: e14159d2 

am: 4be5c415

Change-Id: I4b505c1cd61d92d1a4aca4efd5760506379c1f86
parents e8acf307 4be5c415

core/java/android/content/ContentResolver.java

+1 −7
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 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;
@@ -516,13 +515,8 @@ 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);