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

Commit 359c48c8 authored by Selim Cinek's avatar Selim Cinek
Browse files

resolve merge conflicts of 04831844 to master 

Change-Id: I8466c8d56b5685705591dad7cfb7d439b6dee3d7
parents 807cf869 04831844

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -343,6 +343,7 @@ LOCAL_SRC_FILES += \ 
	core/java/com/android/internal/view/IInputMethodManager.aidl \

	core/java/com/android/internal/view/IInputMethodSession.aidl \

	core/java/com/android/internal/view/IInputSessionCallback.aidl \

	core/java/com/android/internal/widget/ICheckCredentialProgressCallback.aidl \

	core/java/com/android/internal/widget/ILockSettings.aidl \

	core/java/com/android/internal/widget/IRemoteViewsFactory.aidl \

	core/java/com/android/internal/widget/IRemoteViewsAdapterConnection.aidl \

core/java/android/app/IWallpaperManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ interface IWallpaperManager { 
     * information about that wallpaper.  Otherwise, if it is a static image,

     * simply return null.

     */

    WallpaperInfo getWallpaperInfo();

    WallpaperInfo getWallpaperInfo(int userId);



    /**

     * Clear the system wallpaper.

core/java/android/app/WallpaperManager.java

+2 −1
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ import android.os.ParcelFileDescriptor; 
import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.text.TextUtils;

import android.util.Log;

import android.view.WindowManagerGlobal;
@@ -783,7 +784,7 @@ public class WallpaperManager { 
                Log.w(TAG, "WallpaperService not running");

                throw new RuntimeException(new DeadSystemException());

            } else {

                return sGlobals.mService.getWallpaperInfo();

                return sGlobals.mService.getWallpaperInfo(UserHandle.myUserId());

            }

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

core/java/com/android/internal/widget/ICheckCredentialProgressCallback.aidl

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.internal.widget;



/** {@hide} */

oneway interface ICheckCredentialProgressCallback {

    void onCredentialVerified();

}

core/java/com/android/internal/widget/ILockSettings.aidl

+5 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.internal.widget;



import android.app.trust.IStrongAuthTracker;

import com.android.internal.widget.ICheckCredentialProgressCallback;

import com.android.internal.widget.VerifyCredentialResponse;



/** {@hide} */
@@ -29,10 +30,12 @@ interface ILockSettings { 
    String getString(in String key, in String defaultValue, in int userId);

    void setLockPattern(in String pattern, in String savedPattern, int userId);

    void resetKeyStore(int userId);

    VerifyCredentialResponse checkPattern(in String pattern, int userId);

    VerifyCredentialResponse checkPattern(in String pattern, int userId,

            in ICheckCredentialProgressCallback progressCallback);

    VerifyCredentialResponse verifyPattern(in String pattern, long challenge, int userId);

    void setLockPassword(in String password, in String savedPassword, int userId);

    VerifyCredentialResponse checkPassword(in String password, int userId);

    VerifyCredentialResponse checkPassword(in String password, int userId,

            in ICheckCredentialProgressCallback progressCallback);

    VerifyCredentialResponse verifyPassword(in String password, long challenge, int userId);

    VerifyCredentialResponse verifyTiedProfileChallenge(String password, boolean isPattern, long challenge, int userId);

    boolean checkVoldPassword(int userId);