From 6146b476afdb9588cd6442fec5d090d99fbbbbb6 Mon Sep 17 00:00:00 2001 From: Scott Mertz Date: Fri, 30 Oct 2015 10:30:01 -0700 Subject: Fix a couple of checkapi errors for themes Change-Id: Iee2ded64f0bea8a295895542eecf7b9256ce0476 --- core/java/android/content/pm/ApplicationInfo.java | 2 +- core/java/android/content/pm/PackageManager.java | 3 --- test-runner/src/android/test/mock/MockPackageManager.java | 4 ++++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java index 2af7db9..23e8b80 100644 --- a/core/java/android/content/pm/ApplicationInfo.java +++ b/core/java/android/content/pm/ApplicationInfo.java @@ -669,7 +669,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { */ public boolean protect = false; - /* + /** * Is given application theme agnostic, i.e. behaves properly when default theme is changed. * @hide */ diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 3dddefe..8928ad3 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -836,7 +836,6 @@ public abstract class PackageManager { * if the system failed to install the theme because aapt could not compile the app * @hide */ - @SystemApi public static final int INSTALL_FAILED_THEME_AAPT_ERROR = -400; /** @@ -847,7 +846,6 @@ public abstract class PackageManager { * apps. * @hide */ - @SystemApi public static final int INSTALL_FAILED_THEME_IDMAP_ERROR = -401; /** @@ -858,7 +856,6 @@ public abstract class PackageManager { * apps. * @hide */ - @SystemApi public static final int INSTALL_FAILED_THEME_UNKNOWN_ERROR = -402; /** diff --git a/test-runner/src/android/test/mock/MockPackageManager.java b/test-runner/src/android/test/mock/MockPackageManager.java index a547214..7aacb23 100644 --- a/test-runner/src/android/test/mock/MockPackageManager.java +++ b/test-runner/src/android/test/mock/MockPackageManager.java @@ -971,6 +971,10 @@ public class MockPackageManager extends PackageManager { throw new UnsupportedOperationException(); } + /** + * @hide + */ + @Override public void updateIconMaps(String pkgName) { throw new UnsupportedOperationException(); } -- cgit v1.1