diff options
| author | Svetoslav <svetoslavganov@google.com> | 2015-11-20 14:00:11 -0800 |
|---|---|---|
| committer | Svetoslav <svetoslavganov@google.com> | 2015-11-20 14:02:19 -0800 |
| commit | ef861375eebd9ac6cce7c0bb163380ab1c951063 (patch) | |
| tree | 870ae89605e49658de3e5abca2797b68c5efbb26 /src/com/android/packageinstaller/permission/model | |
| parent | 9c78316fe6baa4f7fd7d5108349ecf8a2532b047 (diff) | |
| download | android_packages_apps_PackageInstaller-ef861375eebd9ac6cce7c0bb163380ab1c951063.tar.gz android_packages_apps_PackageInstaller-ef861375eebd9ac6cce7c0bb163380ab1c951063.tar.bz2 android_packages_apps_PackageInstaller-ef861375eebd9ac6cce7c0bb163380ab1c951063.zip | |
resolve merge conflicts of c10abb25f3 to cw-e-dev.
Change-Id: I3fe38a9ac62466b38efec834dceb712d2782c518
Diffstat (limited to 'src/com/android/packageinstaller/permission/model')
| -rw-r--r-- | src/com/android/packageinstaller/permission/model/PermissionApps.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/packageinstaller/permission/model/PermissionApps.java b/src/com/android/packageinstaller/permission/model/PermissionApps.java index 9365bf13..e5d96d55 100644 --- a/src/com/android/packageinstaller/permission/model/PermissionApps.java +++ b/src/com/android/packageinstaller/permission/model/PermissionApps.java @@ -31,6 +31,7 @@ import android.util.ArraySet; import android.util.Log; import android.util.SparseArray; +import com.android.packageinstaller.R; import com.android.packageinstaller.permission.utils.Utils; import java.util.ArrayList; @@ -275,7 +276,7 @@ public class PermissionApps { if (info.icon != 0) { mIcon = info.loadUnbadgedIcon(mPm); } else { - mIcon = mContext.getDrawable(com.android.internal.R.drawable.ic_perm_device_info); + mIcon = mContext.getDrawable(R.drawable.ic_perm_device_info); } mIcon = Utils.applyTint(mContext, mIcon, android.R.attr.colorControlNormal); } |