summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSharvil Nanavati <sharvil@google.com>2015-11-21 08:06:33 (GMT)
committerSharvil Nanavati <sharvil@google.com>2015-11-21 08:06:33 (GMT)
commit741ac03b4367c06d33190b80e2f6a6003a803517 (patch)
tree74317e6faf9dff400d4770af7673cf4c08f2c56c
parentc3d14f58d80cc5ed8b60ee1782d38643c08734e7 (diff)
downloadandroid_packages_apps_PackageInstaller-741ac03b4367c06d33190b80e2f6a6003a803517.zip
android_packages_apps_PackageInstaller-741ac03b4367c06d33190b80e2f6a6003a803517.tar.gz
android_packages_apps_PackageInstaller-741ac03b4367c06d33190b80e2f6a6003a803517.tar.bz2
Fix build break.
Bug: 25822682 Change-Id: Ib5b40f014a8b6d0fb756d7f4c4802c9e8dfa7a44
-rw-r--r--src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java6
-rw-r--r--src/com/android/packageinstaller/permission/utils/Utils.java4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java
index a92b0ea..fad35e1 100644
--- a/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java
+++ b/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java
@@ -20,13 +20,9 @@ import android.app.Fragment;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
-import com.android.packageinstaller.permission.utils.Utils;
-<<<<<<< HEAD
-
import com.android.packageinstaller.permission.ui.wear.AppPermissionsFragmentWear;
+import com.android.packageinstaller.permission.utils.Utils;
import com.android.packageinstaller.DeviceUtils;
-=======
->>>>>>> c10abb25f3864e56b2a24ef3661511cd78921225
public final class ManagePermissionsActivity extends OverlayTouchActivity {
private static final String LOG_TAG = "ManagePermissionsActivity";
diff --git a/src/com/android/packageinstaller/permission/utils/Utils.java b/src/com/android/packageinstaller/permission/utils/Utils.java
index 2183037..b8a79d5 100644
--- a/src/com/android/packageinstaller/permission/utils/Utils.java
+++ b/src/com/android/packageinstaller/permission/utils/Utils.java
@@ -146,4 +146,8 @@ public class Utils {
return info.isSystemApp() && (info.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) == 0
&& !launcherPkgs.contains(info.packageName);
}
+
+ public static boolean isTelevision(Object o) {
+ return false;
+ }
}