Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: e14159d2c5

Change-Id: Ia51f9f817a7792c5b4e63ad5af532ebd59cff95f
This commit is contained in:
Jeff Sharkey
2017-04-29 17:48:28 +00:00
committed by android-build-merger
parent 8e19424e6f e14159d2c5
commit 4be5c41542
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/content/ContentResolver.java
View File

@@ -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,12 +515,7 @@ 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;
}
mTargetSdkVersion = mContext.getApplicationInfo().targetSdkVersion;
}
/** @hide */