--- old/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.m	2016-05-24 16:15:01.000000000 +0530
+++ new/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.m	2016-05-24 16:15:01.000000000 +0530
@@ -131,7 +131,7 @@
     {0x3A, NO,  KL_UNKNOWN,  java_awt_event_KeyEvent_VK_ALT},       // ****
     {0x3B, NO,  KL_UNKNOWN,  java_awt_event_KeyEvent_VK_CONTROL},   // ****
     {0x3C, NO,  KL_UNKNOWN,  java_awt_event_KeyEvent_VK_UNDEFINED},
-    {0x3D, NO,  KL_UNKNOWN,  java_awt_event_KeyEvent_VK_UNDEFINED},
+    {0x3D, NO,  KL_UNKNOWN,  java_awt_event_KeyEvent_VK_ALT_GRAPH},
     {0x3E, NO,  KL_UNKNOWN,  java_awt_event_KeyEvent_VK_UNDEFINED},
     {0x3F, NO,  KL_UNKNOWN,  java_awt_event_KeyEvent_VK_UNDEFINED}, // the 'fn' key on PowerBooks
     {0x40, NO,  KL_STANDARD, java_awt_event_KeyEvent_VK_F17},
@@ -293,7 +293,7 @@
         61,
         java_awt_event_InputEvent_ALT_DOWN_MASK | java_awt_event_InputEvent_ALT_GRAPH_DOWN_MASK,
         java_awt_event_InputEvent_ALT_MASK | java_awt_event_InputEvent_ALT_GRAPH_MASK,
-        java_awt_event_KeyEvent_VK_ALT
+        java_awt_event_KeyEvent_VK_ALT | java_awt_event_KeyEvent_VK_ALT_GRAPH
     },
     {
         NSCommandKeyMask,
--- old/src/java.desktop/macosx/native/libawt_lwawt/awt/CRobot.m	2016-05-24 16:15:02.000000000 +0530
+++ new/src/java.desktop/macosx/native/libawt_lwawt/awt/CRobot.m	2016-05-24 16:15:02.000000000 +0530
@@ -266,18 +266,27 @@
      * that uses Accessibility API instead.
      */
     CGKeyCode keyCode = GetCGKeyCode(javaKeyCode);
-    AXUIElementRef elem = AXUIElementCreateSystemWide();
-    AXUIElementPostKeyboardEvent(elem, (CGCharCode)0, keyCode, keyPressed);
-    CFRelease(elem);
-
+//    AXUIElementRef elem = AXUIElementCreateSystemWide();
+//    AXUIElementPostKeyboardEvent(elem, (CGCharCode)0, keyCode, keyPressed);
+//    CFRelease(elem);
+
+	/*
+     * JDK-8155740: AXUIElementPostKeyboardEvent posts 0 key code for all
+     * the modifier keys with key codes (16, 17,18, 20, 157) and also for
+     * newly added modifier key VK_ALT_GRAPH. But it posts correct key code
+     * for all the other keys. On the other hand CGEventCreateKeyboardEvent
+     * posts correct key code for all the keys and hence it is used to post
+     * all the key events instead of AXUIElementPostKeyboardEvent.
+     * Key code for modifier key is required to distinguish between ALT and
+     * ALT-GR key for fixing issue 8155740.
+     */
 
-#if 0
-    CGEventRef event = CGEventCreateKeyboardEvent(NULL, keyCode, keyPressed);
+    CGEventSourceRef source = CGEventSourceCreate(kCGEventSourceStateHIDSystemState);
+    CGEventRef event = CGEventCreateKeyboardEvent(source, keyCode, keyPressed);
     if (event != NULL) {
         CGEventPost(kCGSessionEventTap, event);
         CFRelease(event);
     }
-#endif
 }
 
 /*
--- old/src/java.desktop/macosx/native/libawt_lwawt/awt/CRobotKeyCode.m	2016-05-24 16:15:03.000000000 +0530
+++ new/src/java.desktop/macosx/native/libawt_lwawt/awt/CRobotKeyCode.m	2016-05-24 16:15:03.000000000 +0530
@@ -53,6 +53,7 @@
             [NSNumber numberWithInt : OSX_Shift], [NSNumber numberWithInt : java_awt_event_KeyEvent_VK_SHIFT],
             [NSNumber numberWithInt : OSX_Control], [NSNumber numberWithInt : java_awt_event_KeyEvent_VK_CONTROL],
             [NSNumber numberWithInt : OSX_Option], [NSNumber numberWithInt : java_awt_event_KeyEvent_VK_ALT],
+            [NSNumber numberWithInt : OSX_RightOption], [NSNumber numberWithInt : java_awt_event_KeyEvent_VK_ALT_GRAPH],
             [NSNumber numberWithInt : OSX_CapsLock], [NSNumber numberWithInt : java_awt_event_KeyEvent_VK_CAPS_LOCK],
             [NSNumber numberWithInt : OSX_Escape], [NSNumber numberWithInt : java_awt_event_KeyEvent_VK_ESCAPE],
             [NSNumber numberWithInt : OSX_kVK_Space], [NSNumber numberWithInt : java_awt_event_KeyEvent_VK_SPACE],
--- old/test/java/awt/keyboard/AllKeyCode/AllKeyCode.java	2016-05-24 16:15:05.000000000 +0530
+++ new/test/java/awt/keyboard/AllKeyCode/AllKeyCode.java	2016-05-24 16:15:04.000000000 +0530
@@ -22,15 +22,14 @@
  */
 
 /*
-  @test
-  @bug 8149456 8147834 8150230
-  @requires os.family == "mac"
-  @summary KeyEvents for all keys
-  @run main AllKeyCode
-*/
+ @test
+ @bug 8149456 8147834 8150230 8155740
+ @requires os.family == "mac"
+ @summary Tests key codes for all keys supported in Java for Mac OS X.
+ @run main AllKeyCode
+ */
 
 import java.awt.AWTException;
-import java.awt.GridBagLayout;
 import java.awt.Robot;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
@@ -149,7 +148,8 @@
             KeyEvent.VK_F17,
             KeyEvent.VK_F18,
             KeyEvent.VK_F19,
-            KeyEvent.VK_F20
+            KeyEvent.VK_F20,
+            KeyEvent.VK_ALT_GRAPH
         };
 
         keyPressedIndex = -1;