diff options
| author | David Brazdil <dbrazdil@google.com> | 2018-11-02 06:17:10 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-11-02 06:17:10 -0700 |
| commit | c62139b488e1116b27ba4f73d628791397324da2 (patch) | |
| tree | 2c700db87ebe039e321e75e60941b01e2b975a6b /core/java/android | |
| parent | 58ccf0e41e29570669f1c3467ce4534c6d14cd82 (diff) | |
| parent | 6a35521032f6e68c7981ba2ca1d0209049b8c77f (diff) | |
Merge "Remove non-SDK API toast" am: 13c2382d4f
am: 6a35521032
Change-Id: Idd0496cf57b2b58a95a0377d969f7a0589f904a7
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/Activity.java | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index f86b74b4023e..5ddd5edcb478 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -131,8 +131,6 @@ import com.android.internal.app.ToolbarActionBar; import com.android.internal.app.WindowDecorActionBar; import com.android.internal.policy.PhoneWindow; -import dalvik.system.VMRuntime; - import java.io.FileDescriptor; import java.io.PrintWriter; import java.lang.annotation.Retention; @@ -7243,31 +7241,6 @@ public class Activity extends ContextThemeWrapper } } - // This property is set for all non-user builds except final release - boolean isApiWarningEnabled = SystemProperties.getInt("ro.art.hiddenapi.warning", 0) == 1; - - if (isAppDebuggable || isApiWarningEnabled) { - if (!mMainThread.mHiddenApiWarningShown && VMRuntime.getRuntime().hasUsedHiddenApi()) { - // Only show the warning once per process. - mMainThread.mHiddenApiWarningShown = true; - - String appName = getApplicationInfo().loadLabel(getPackageManager()) - .toString(); - String warning = "Detected problems with API compatibility\n" - + "(visit g.co/dev/appcompat for more info)"; - if (isAppDebuggable) { - new AlertDialog.Builder(this) - .setTitle(appName) - .setMessage(warning) - .setPositiveButton(android.R.string.ok, null) - .setCancelable(false) - .show(); - } else { - Toast.makeText(this, appName + "\n" + warning, Toast.LENGTH_LONG).show(); - } - } - } - mActivityTransitionState.enterReady(this); } |