Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 741ac03b authored by Sharvil Nanavati's avatar Sharvil Nanavati
Browse files

Fix build break. 

Bug: 25822682
Change-Id: Ib5b40f014a8b6d0fb756d7f4c4802c9e8dfa7a44
parent c3d14f58

src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java

+1 −5
Original line number Diff line number Diff line
@@ -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";

src/com/android/packageinstaller/permission/utils/Utils.java

+4 −0
Original line number Diff line number Diff line
@@ -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;

    }

}