Merge "Restore the OEM hook implementation and usage" am: 093ade312d

am: caee2573f9

Change-Id: I8a29091c8726a4e5160ec00c205ec1782c6842fb

telephony/java/android/telephony/PhoneStateListener.java

@@ -612,6 +612,16 @@ public class PhoneStateListener {
         // default implementation empty
     }
 
+    /**
+     * Callback invoked when OEM hook raw event is received. Requires
+     * the READ_PRIVILEGED_PHONE_STATE permission.
+     * @param rawData is the byte array of the OEM hook raw data.
+     * @hide
+     */
+    public void onOemHookRawEvent(byte[] rawData) {
+        // default implementation empty
+    }
+
     /**
      * Callback invoked when telephony has received notice from a carrier
      * app that a network action that could result in connectivity loss