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

Commit e8e93a14 authored by Amith Yamasani's avatar Amith Yamasani
Browse files

Fix build error due to incorrect merge 

Keyguard package was moved, so a new file didn't get to the right directory.

Change-Id: I2cdf2d9ef785ca7852c38278f51b5af9f96320f7
parent 89efc6e6

packages/Keyguard/src/com/android/keyguard/KeyguardMultiUserAvatar.java

+0 −8
Original line number Diff line number Diff line
@@ -122,14 +122,6 @@ class KeyguardMultiUserAvatar extends FrameLayout { 
        mUserImage = (ImageView) findViewById(R.id.keyguard_user_avatar);

        mUserName = (TextView) findViewById(R.id.keyguard_user_name);



        Bitmap icon = mUserManager.getUserIcon(user.id);



        if (icon == null) {

            if (DEBUG) Log.w(TAG, "Couldn't get user icon for user id " + user.id);

            icon = BitmapFactory.decodeResource(mContext.getResources(),

                    R.drawable.ic_contact_picture);

        }



        mFramed = (KeyguardCircleFramedDrawable)

                KeyguardViewMediator.getAvatarCache().get(user.id);

packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import android.os.Handler; 
import android.os.IRemoteCallback;

import android.os.Message;

import android.os.RemoteException;

import android.os.UserHandle;

import android.provider.Settings;



import com.android.internal.telephony.IccCardConstants;

policy/src/com/android/internal/policy/impl/keyguard/MultiUserAvatarCache.java→packages/Keyguard/src/com/android/keyguard/MultiUserAvatarCache.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.internal.policy.impl.keyguard;

package com.android.keyguard;



import android.graphics.drawable.Drawable;