diff options
| author | 2018-01-31 19:39:30 +0000 | |
|---|---|---|
| committer | 2018-01-31 19:39:30 +0000 | |
| commit | 169a15920754b87c126c47d8d303c2edcc651ed8 (patch) | |
| tree | d2ff0c83a2264abb62017efc7c6b07a898fe9916 | |
| parent | 7940256a915e8c9224c0e4236075a97b8af1bdb6 (diff) | |
| parent | 880839d2d10d0a3468a29b9ea20007159f014444 (diff) | |
Merge "Show hidden API warning once per process"
am: 880839d2d1
Change-Id: I2da706085d0ee0cb047b6b5c516c8a91487b77eb
| -rw-r--r-- | core/java/android/app/Activity.java | 5 | ||||
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 3abb24ce7b20..da324fc1b092 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -7071,7 +7071,10 @@ public class Activity extends ContextThemeWrapper boolean isApiWarningEnabled = SystemProperties.getInt("ro.art.hiddenapi.warning", 0) == 1; if (isAppDebuggable || isApiWarningEnabled) { - if (VMRuntime.getRuntime().hasUsedHiddenApi()) { + 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 compatiblity\n" diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 2ecd3120345d..565eaeb632b1 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -266,6 +266,7 @@ public final class ActivityThread { boolean mJitEnabled = false; boolean mSomeActivitiesChanged = false; boolean mUpdatingSystemConfig = false; + /* package */ boolean mHiddenApiWarningShown = false; // These can be accessed by multiple threads; mResourcesManager is the lock. // XXX For now we keep around information about all packages we have |