Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Validate custom pointer icons aren't null.

Browse Source 
Bug: 33853287
Test: cts
Change-Id: I844a9aec6e37e306a77eee0644a774f6470cf5df
(cherry picked from commit b004b5137e)
This commit is contained in:
Michael Wright
2017-01-18 18:09:29 +00:00
committed by Erik Wolsheimer
parent 1894632864
commit 35068079c8
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/jni/android_view_PointerIcon.cpp
View File

@@ -78,6 +78,9 @@ status_t android_view_PointerIcon_load(JNIEnv* env, jobject pointerIconObj, jobj
status_t android_view_PointerIcon_getLoadedIcon(JNIEnv* env, jobject pointerIconObj,
PointerIcon* outPointerIcon) {
if (!pointerIconObj) {
return BAD_VALUE;
}
outPointerIcon->style = env->GetIntField(pointerIconObj, gPointerIconClassInfo.mType);
outPointerIcon->hotSpotX = env->GetFloatField(pointerIconObj, gPointerIconClassInfo.mHotSpotX);
outPointerIcon->hotSpotY = env->GetFloatField(pointerIconObj, gPointerIconClassInfo.mHotSpotY);

2
services/core/java/com/android/server/input/InputManagerService.java
View File

@@ -25,6 +25,7 @@ import android.view.Display;
import com.android.internal.inputmethod.InputMethodSubtypeHandle;
import com.android.internal.os.SomeArgs;
import com.android.internal.R;
import com.android.internal.util.Preconditions;
import com.android.internal.util.XmlUtils;
import com.android.server.DisplayThread;
import com.android.server.LocalServices;
@@ -1705,6 +1706,7 @@ public class InputManagerService extends IInputManager.Stub
// Binder call
@Override
public void setCustomPointerIcon(PointerIcon icon) {
Preconditions.checkNotNull(icon);
nativeSetCustomPointerIcon(mPtr, icon);
}

6
services/core/jni/com_android_server_input_InputManagerService.cpp
View File

@@ -1462,7 +1462,11 @@ static void nativeSetCustomPointerIcon(JNIEnv* env, jclass /* clazz */,
NativeInputManager* im = reinterpret_cast<NativeInputManager*>(ptr);
PointerIcon pointerIcon;
android_view_PointerIcon_getLoadedIcon(env, iconObj, &pointerIcon);
status_t result = android_view_PointerIcon_getLoadedIcon(env, iconObj, &pointerIcon);
if (result) {
jniThrowRuntimeException(env, "Failed to load custom pointer icon.");
return;
}
SpriteIcon spriteIcon;
pointerIcon.bitmap.copyTo(&spriteIcon.bitmap, kN32_SkColorType);