summaryrefslogtreecommitdiffstats
path: root/test-runner
diff options
context:
space:
mode:
authorJeff Hao <jeffhao@google.com>2014-10-30 23:44:09 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-30 23:44:09 +0000
commit05ea3213fd68204aa7cd9cc4b9b6a0a973f69c17 (patch)
tree7715bbc8d1d20fa3cc767d0d715e5192616f4c58 /test-runner
parent2a369533947c5552ba8e1c5cc9fb657952e3f0e0 (diff)
parent73577862ffe6332f326628febfa1fbb9e693bb40 (diff)
downloadframeworks_base-05ea3213fd68204aa7cd9cc4b9b6a0a973f69c17.zip
frameworks_base-05ea3213fd68204aa7cd9cc4b9b6a0a973f69c17.tar.gz
frameworks_base-05ea3213fd68204aa7cd9cc4b9b6a0a973f69c17.tar.bz2
am 73577862: am b1346d78: Merge "Change boot screen title to "Android is starting" when not upgrading." into lmp-mr1-dev
* commit '73577862ffe6332f326628febfa1fbb9e693bb40': Change boot screen title to "Android is starting" when not upgrading.
Diffstat (limited to 'test-runner')
-rw-r--r--test-runner/src/android/test/mock/MockPackageManager.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/test-runner/src/android/test/mock/MockPackageManager.java b/test-runner/src/android/test/mock/MockPackageManager.java
index 7f1dc71..7531d7b 100644
--- a/test-runner/src/android/test/mock/MockPackageManager.java
+++ b/test-runner/src/android/test/mock/MockPackageManager.java
@@ -733,6 +733,14 @@ public class MockPackageManager extends PackageManager {
* @hide
*/
@Override
+ public boolean isUpgrade() {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * @hide
+ */
+ @Override
public void installPackage(Uri packageURI, PackageInstallObserver observer,
int flags, String installerPackageName) {
throw new UnsupportedOperationException();