summaryrefslogtreecommitdiffstats
path: root/test-runner
diff options
context:
space:
mode:
authorBenjamin Franz <bfranz@google.com>2014-10-06 16:52:27 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-06 16:52:27 +0000
commitadabf536fbb971b2eb50a37f563e3027bda04061 (patch)
tree9455033b4b82d01219d0ab398a9f6c5e1a411236 /test-runner
parent6da9182faec9a8a7cc0d597957d00dd5e8226e34 (diff)
parent00fcb749cbd26c83d1a29a974bd92967b41c5882 (diff)
downloadframeworks_base-adabf536fbb971b2eb50a37f563e3027bda04061.zip
frameworks_base-adabf536fbb971b2eb50a37f563e3027bda04061.tar.gz
frameworks_base-adabf536fbb971b2eb50a37f563e3027bda04061.tar.bz2
am 00fcb749: am 31409c0c: Merge "Introduce new API to get an unbadged icon and unbadge permissions." into lmp-mr1-dev
* commit '00fcb749cbd26c83d1a29a974bd92967b41c5882': Introduce new API to get an unbadged icon and unbadge permissions.
Diffstat (limited to 'test-runner')
-rw-r--r--test-runner/src/android/test/mock/MockPackageManager.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/test-runner/src/android/test/mock/MockPackageManager.java b/test-runner/src/android/test/mock/MockPackageManager.java
index afe1d5d..7f1dc71 100644
--- a/test-runner/src/android/test/mock/MockPackageManager.java
+++ b/test-runner/src/android/test/mock/MockPackageManager.java
@@ -793,4 +793,11 @@ public class MockPackageManager extends PackageManager {
public Drawable loadItemIcon(PackageItemInfo itemInfo, ApplicationInfo appInfo) {
throw new UnsupportedOperationException();
}
+
+ /**
+ * @hide
+ */
+ public Drawable loadUnbadgedItemIcon(PackageItemInfo itemInfo, ApplicationInfo appInfo) {
+ throw new UnsupportedOperationException();
+ }
}